aboutsummaryrefslogtreecommitdiff
path: root/ansible/roles/mw-backend/files/etc
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2018-11-05 23:18:54 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2018-11-05 23:18:54 +0100
commitc25c490677bcba2c2e9fee90db10594bd43f6982 (patch)
tree23bde01f60bf0e4421f680bcd9912b5a12f5b42d /ansible/roles/mw-backend/files/etc
parentb5b7e21c8ba3c68eab9cd244602f27c21aa5f36b (diff)
downloadinfra-c25c490677bcba2c2e9fee90db10594bd43f6982.tar.gz
infra-c25c490677bcba2c2e9fee90db10594bd43f6982.tar.bz2
infra-c25c490677bcba2c2e9fee90db10594bd43f6982.tar.xz
infra-c25c490677bcba2c2e9fee90db10594bd43f6982.zip
Importing Bitraf's mediawiki
o Some improvements, reusing old backup scripts.
Diffstat (limited to 'ansible/roles/mw-backend/files/etc')
-rw-r--r--ansible/roles/mw-backend/files/etc/apache2/sites-enabled/000-default.conf60
-rw-r--r--ansible/roles/mw-backend/files/etc/systemd/system/mw-jobqueue.service12
-rw-r--r--ansible/roles/mw-backend/files/etc/systemd/system/mw-jobqueue.timer9
3 files changed, 0 insertions, 81 deletions
diff --git a/ansible/roles/mw-backend/files/etc/apache2/sites-enabled/000-default.conf b/ansible/roles/mw-backend/files/etc/apache2/sites-enabled/000-default.conf
deleted file mode 100644
index 0af172a..0000000
--- a/ansible/roles/mw-backend/files/etc/apache2/sites-enabled/000-default.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-# Based on /etc/apache2/conf-available/mediawiki.conf
-
-<VirtualHost *:80>
- ServerName mw.trygvis.io
-
- ServerAdmin webmaster@trygvis.io
- DocumentRoot /var/www/mw.trygvis.io
-
- ErrorLog ${APACHE_LOG_DIR}/error.log
- CustomLog ${APACHE_LOG_DIR}/access.log combined
-
- Alias /w /var/lib/mediawiki
- Alias /wiki /var/lib/mediawiki/index.php
- RedirectMatch permanent ^/$ /wiki/Main_Page
-
-<Directory /var/lib/mediawiki/>
- Options +FollowSymLinks
- AllowOverride All
- <IfVersion >= 2.3>
- Require all granted
- </IfVersion>
- <IfVersion < 2.3>
- order allow,deny
- allow from all
- </IfVersion>
-</Directory>
-
-# some directories must be protected
-<Directory /var/lib/mediawiki/config>
- Options -FollowSymLinks
- AllowOverride None
- <IfModule mod_php7.c>
- php_admin_flag engine off
- </IfModule>
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
-</Directory>
-<Directory /var/lib/mediawiki/images>
- Options -FollowSymLinks
- AllowOverride None
- <IfModule mod_php7.c>
- php_admin_flag engine off
- </IfModule>
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
-</Directory>
-<Directory /var/lib/mediawiki/upload>
- Options -FollowSymLinks
- AllowOverride None
- <IfModule mod_php7.c>
- php_admin_flag engine off
- </IfModule>
- <IfModule mod_php5.c>
- php_admin_flag engine off
- </IfModule>
-</Directory>
-</VirtualHost>
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/ansible/roles/mw-backend/files/etc/systemd/system/mw-jobqueue.service b/ansible/roles/mw-backend/files/etc/systemd/system/mw-jobqueue.service
deleted file mode 100644
index a944443..0000000
--- a/ansible/roles/mw-backend/files/etc/systemd/system/mw-jobqueue.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=MediaWiki Job runner
-
-[Service]
-WorkingDirectory=/var/lib/mediawiki/maintenance
-ExecStart=/usr/bin/php runJobs.php --maxjobs 100
-User=www-data
-Group=www-data
-StandardOutput=journal
-
-Nice=10
-OOMScoreAdjust=500
diff --git a/ansible/roles/mw-backend/files/etc/systemd/system/mw-jobqueue.timer b/ansible/roles/mw-backend/files/etc/systemd/system/mw-jobqueue.timer
deleted file mode 100644
index 1d12500..0000000
--- a/ansible/roles/mw-backend/files/etc/systemd/system/mw-jobqueue.timer
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=MediaWiki job runner timer
-
-[Timer]
-OnBootSec=15min
-OnUnitActiveSec=10m
-
-[Install]
-WantedBy=timers.target