Merge branch 'master' of github.com:CSC-IT-Center-for-Science/Kielipa…

…nkki-palvelut
CSCfi · May 26, 2017 · e4ae7e5 · e4ae7e5
2 parents b3de98f + 3267246
commit e4ae7e5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/servers/sanat/roles/mediawiki/tasks/main.yml b/servers/sanat/roles/mediawiki/tasks/main.yml
@@ -31,6 +31,7 @@
 - name: Install LocalSettings.php
   template: src=LocalSettings.php.j2 dest=/srv/mediawiki/workdir/LocalSettings.php
 
+
 - name: Run composer update
   command: /usr/local/bin/composer update --no-dev
   args:

diff --git a/servers/sanat/roles/smsxml/templates/settings.py b/servers/sanat/roles/smsxml/templates/settings.py
@@ -76,6 +76,33 @@
 # Internationalization
 # https://docs.djangoproject.com/en/1.7/topics/i18n/
 
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'formatters': {
+        'standard': {
+            'format' : "[%(asctime)s] %(levelname)s [%(name)s:%(lineno)s] %(message)s",
+            'datefmt' : "%d/%b/%Y %H:%M:%S"
+        }
+    },
+    'handlers': {
+        'file': {
+            'level': 'ERROR',
+            'class': 'logging.FileHandler',
+            'filename': os.path.join(BASE_DIR, 'error.log'),
+            'formatter': 'standard'
+        },
+    },
+    'loggers': {
+        '': {
+            'handlers': ['file'],
+            'level': 'ERROR',
+            'propagate': True,
+        },
+    },
+}
+
+
 LANGUAGE_CODE = 'fi-fi'
 
 TIME_ZONE = 'UTC'

diff --git a/servers/sanat/site.yml b/servers/sanat/site.yml
@@ -21,6 +21,7 @@
     - role: mediawiki
       tags: mediawiki
     - role: smsxml
+      tags: smsxml
     - role: selinux
     - role: geerlingguy.repo-epel
     - role: firewall