Page MenuHomeDevCentral
Files F12261928

D3737.id9665.diff
No OneTemporary
Actions

D3737.id9665.diff
View Options

diff --git a/roles/saas-mediawiki/mediawiki/config.sls b/roles/saas-mediawiki/mediawiki/config.sls
new file mode 100644
--- /dev/null
+++ b/roles/saas-mediawiki/mediawiki/config.sls
@@ -0,0 +1,30 @@
+# -------------------------------------------------------------
+# Salt — MediaWiki farm
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+# -------------------------------------------------------------
+# MediaWiki configuration
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+/srv/mediawiki/LocalSettings.php:
+ file.managed:
+ - source: salt://roles/saas-mediawiki/mediawiki/files/LocalSettings.php
+ - user: mediawiki
+ - group: mediawiki
+ - mode: 644
+ - template: jinja
+ - context:
+ directory: {{ pillar['mediawiki_saas']['directory'] }}
+
+# -------------------------------------------------------------
+# MediaWiki logs
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+/var/log/mediawiki:
+ file.directory:
+ - user: mediawiki
+ - group: mediawiki
+ - mode: 755
diff --git a/roles/saas-mediawiki/mediawiki/init.sls b/roles/saas-mediawiki/mediawiki/init.sls
--- a/roles/saas-mediawiki/mediawiki/init.sls
+++ b/roles/saas-mediawiki/mediawiki/init.sls
@@ -2,86 +2,9 @@
# Salt — MediaWiki farm
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
-# Created: 2018-03-16
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-# -------------------------------------------------------------
-# Base folder
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-/srv/mediawiki:
- file.directory:
- - user: mediawiki
- - group: mediawiki
- - mode: 711
-
-# -------------------------------------------------------------
-# MediaWiki core
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-mediawiki_core_repository:
- git.latest:
- - name: https://gerrit.wikimedia.org/r/p/mediawiki/core.git
- - target: /srv/mediawiki
- - update_head: False
- - user: mediawiki
-
-mediawiki_core_vendor:
- cmd.run:
- - name: composer update --no-dev
- - cwd: /srv/mediawiki
- - runas: mediawiki
- - creates: /srv/mediawiki/vendor
-
-# -------------------------------------------------------------
-# MediaWiki extensions and skins
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-{% for type in ['extensions', 'skins'] %}
-{% for item in salt['pillar.get']('mediawiki_' + type, []) %}
-mediawiki_{{ type }}_repository_{{ item }}:
- git.latest:
- - name: https://gerrit.wikimedia.org/r/p/mediawiki/{{ type }}/{{ item }}.git
- - target: /srv/mediawiki/{{ type }}/{{ item }}
- - update_head: False
- - user: mediawiki
-{% endfor %}
-{% endfor %}
-
-# -------------------------------------------------------------
-# MediaWiki custom extensions
-#
-# :: WolfplexMessages
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-mediawiki_extension_repository_wolfplex_messages:
- git.latest:
- - name: https://github.com/wolfplex/mediawiki-extensions-WolfplexMessages.git
- - target: /srv/mediawiki/extensions/WolfplexMessages
- - update_head: False
- - user: mediawiki
-
-# -------------------------------------------------------------
-# MediaWiki configuration
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-/srv/mediawiki/LocalSettings.php:
- file.managed:
- - source: salt://roles/saas-mediawiki/mediawiki/files/LocalSettings.php
- - user: mediawiki
- - group: mediawiki
- - mode: 644
- - template: jinja
- - context:
- directory: {{ pillar['mediawiki_saas']['directory'] }}
-
-# -------------------------------------------------------------
-# MediaWiki logs
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-/var/log/mediawiki:
- file.directory:
- - user: mediawiki
- - group: mediawiki
- - mode: 755
+include:
+ - .software
+ - .config
diff --git a/roles/saas-mediawiki/mediawiki/init.sls b/roles/saas-mediawiki/mediawiki/software.sls
copy from roles/saas-mediawiki/mediawiki/init.sls
copy to roles/saas-mediawiki/mediawiki/software.sls
--- a/roles/saas-mediawiki/mediawiki/init.sls
+++ b/roles/saas-mediawiki/mediawiki/software.sls
@@ -2,7 +2,6 @@
# Salt — MediaWiki farm
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
-# Created: 2018-03-16
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
@@ -61,27 +60,3 @@
- target: /srv/mediawiki/extensions/WolfplexMessages
- update_head: False
- user: mediawiki
-
-# -------------------------------------------------------------
-# MediaWiki configuration
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-/srv/mediawiki/LocalSettings.php:
- file.managed:
- - source: salt://roles/saas-mediawiki/mediawiki/files/LocalSettings.php
- - user: mediawiki
- - group: mediawiki
- - mode: 644
- - template: jinja
- - context:
- directory: {{ pillar['mediawiki_saas']['directory'] }}
-
-# -------------------------------------------------------------
-# MediaWiki logs
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-/var/log/mediawiki:
- file.directory:
- - user: mediawiki
- - group: mediawiki
- - mode: 755

File Metadata

Mime Type
text/plain
Expires
Wed, Oct 15, 08:58 (9 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3074610
Default Alt Text
D3737.id9665.diff (5 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator