From f78210081f2c2f6c021345c89f94c5714a0515b3 Mon Sep 17 00:00:00 2001
From: Mika <mika.hamalainen@mail.com>
Date: Mon, 22 May 2017 10:47:46 +0300
Subject: [PATCH 1/2] smsxml log configuration

---
 servers/sanat/roles/mediawiki/tasks/main.yml  |  8 ------
 .../sanat/roles/smsxml/templates/settings.py  | 27 +++++++++++++++++++
 servers/sanat/site.yml                        |  1 +
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/servers/sanat/roles/mediawiki/tasks/main.yml b/servers/sanat/roles/mediawiki/tasks/main.yml
index 73a46083..2224cd8e 100644
--- a/servers/sanat/roles/mediawiki/tasks/main.yml
+++ b/servers/sanat/roles/mediawiki/tasks/main.yml
@@ -31,14 +31,6 @@
 - name: Install LocalSettings.php
   template: src=LocalSettings.php.j2 dest=/srv/mediawiki/workdir/LocalSettings.php
 
-- name: Copy Composer installer
-  copy: src=composer_installer.sh dest=/tmp/composer_installer.sh mode="u=rwx"
-
-- name: Install Composer
-  command: /tmp/composer_installer.sh
-  args:
-    creates: /usr/local/bin/composer
-  become: true
 
 - name: Run composer update
   command: /usr/local/bin/composer update --no-dev
diff --git a/servers/sanat/roles/smsxml/templates/settings.py b/servers/sanat/roles/smsxml/templates/settings.py
index 85962c62..97c040e8 100644
--- 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
index df7dd6a7..70c2e58d 100644
--- a/servers/sanat/site.yml
+++ b/servers/sanat/site.yml
@@ -15,6 +15,7 @@
     - role: mediawiki
       tags: mediawiki
     - role: smsxml
+      tags: smsxml
     - role: selinux
     - role: geerlingguy.repo-epel
     - role: apache_ssl

From dc2da2496e5bfe7782e5eb1b019addab3a20370f Mon Sep 17 00:00:00 2001
From: Mika <mika.hamalainen@mail.com>
Date: Mon, 22 May 2017 10:51:30 +0300
Subject: [PATCH 2/2] conflict resolved

---
 servers/sanat/roles/mediawiki/tasks/main.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/servers/sanat/roles/mediawiki/tasks/main.yml b/servers/sanat/roles/mediawiki/tasks/main.yml
index dd170e63..2224cd8e 100644
--- a/servers/sanat/roles/mediawiki/tasks/main.yml
+++ b/servers/sanat/roles/mediawiki/tasks/main.yml
@@ -31,10 +31,7 @@
 - name: Install LocalSettings.php
   template: src=LocalSettings.php.j2 dest=/srv/mediawiki/workdir/LocalSettings.php
 
-<<<<<<< HEAD
 
-=======
->>>>>>> 5d74a39a00e8f501c22f253a3ac5569e9a407015
 - name: Run composer update
   command: /usr/local/bin/composer update --no-dev
   args: