From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 12 Apr 2017 22:19:20 +0000 (-0400)
Subject: rsyslog configs, better user of variables
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=82e1682aa994647b731392cd899ec11b9b11007a;p=working%2Frandom.git

rsyslog configs, better user of variables

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/evergreen/eg-install.yml b/evergreen/eg-install.yml
index 1284d4c36..017643f7a 100644
--- a/evergreen/eg-install.yml
+++ b/evergreen/eg-install.yml
@@ -8,39 +8,31 @@
 - name: Create XUL Current Symlink
   file:
     state: link
-    src: /openils/var/web/xul/{{eg_stamp_id}}
-    dest: /openils/var/web/xul/current
+    src: "{{eg_install_path}}/var/web/xul/{{eg_stamp_id}}"
+    dest: "{{eg_install_path}}/var/web/xul/current"
 - name: Create XUL Server Symlink
   file:
     state: link
-    src: /openils/var/web/xul/current/server
-    dest: /openils/var/web/xul/server
+    src: "{{eg_install_path}}/var/web/xul/current/server"
+    dest: "{{eg_install_path}}/var/web/xul/server"
 - copy:
-    src: /openils/conf/opensrf.xml.example 
-    dest: /openils/conf/opensrf.xml
+    src: "{{eg_install_path}}/conf/opensrf.xml.example"
+    dest: "{{eg_install_path}}/conf/opensrf.xml"
     force: no
 - copy:
-    src: /openils/conf/opensrf_core.xml.example
-    dest: /openils/conf/opensrf_core.xml
+    src: "{{eg_install_path}}/conf/opensrf_core.xml.example"
+    dest: "{{eg_install_path}}/conf/opensrf_core.xml"
     force: no
 - get_url: url={{dojo_url}} dest=/tmp/dojo-release-{{dojo_version}}.tar.gz
 - unarchive:
     src: /tmp/dojo-release-{{dojo_version}}.tar.gz
     dest: /tmp/
-- copy: src=/tmp/dojo-release-{{dojo_version}}/ dest=/openils/var/web/js/dojo/
-- file: dest="{{eg_install_path}}" owner=opensrf group=opensrf recurse=yes
-- copy: src=/openils/conf/srfsh.xml.example dest=/home/opensrf/.srfsh.xml force=no
+- copy: src=/tmp/dojo-release-{{dojo_version}}/ dest={{eg_install_path}}/var/web/js/dojo/
+- file: dest={{eg_install_path}} owner=opensrf group=opensrf recurse=yes
+- copy: src={{eg_install_path}}/conf/srfsh.xml.example dest=/home/opensrf/.srfsh.xml force=no
 - file: dest=/home/opensrf/.srfsh.xml owner=opensrf group=opensrf
 - name: Copy ldconfig
   copy:
     src: "{{playbook_dir}}/evergreen/evergreen.ld.conf"
     dest: /etc/ld.so.conf.d/evergreen.ld.conf
 - shell: ldconfig
-- name: Configure Rsyslog
-  when: use_rsyslog
-  copy:
-    src: "{{repo_base}}/Evergreen/Open-ILS/examples/evergreen-rsyslog.conf"
-    dest: /etc/rsyslog.d/evergreen.conf
-- name: Restart Rsyslog
-  when: use_rsyslog
-  service: name=rsyslog state=restarted
diff --git a/evergreen/main.yml b/evergreen/main.yml
index 407369344..2043448f6 100644
--- a/evergreen/main.yml
+++ b/evergreen/main.yml
@@ -4,6 +4,9 @@
   include: eg-web.yml
 - name: Install Evergreen
   include: eg-install.yml
+- name: Setup Rsyslog
+  include: rsyslog.yml
+  when: use_rsyslog
 - name: Setup Apache
   include: apache.yml
 - name: Install Nginx
diff --git a/evergreen/rsyslog.yml b/evergreen/rsyslog.yml
new file mode 100644
index 000000000..1cef2be9b
--- /dev/null
+++ b/evergreen/rsyslog.yml
@@ -0,0 +1,21 @@
+- name: Configure Rsyslog
+  when: use_rsyslog
+  copy:
+    src: "{{repo_base}}/Evergreen/Open-ILS/examples/evergreen-rsyslog.conf"
+    dest: /etc/rsyslog.d/evergreen.conf
+- name: Restart Rsyslog
+  when: use_rsyslog
+  service: name=rsyslog state=restarted
+- name: Update opensrf_core.xml for rsyslog
+  replace:
+    dest: "{{eg_install_path}}/conf/opensrf_core.xml"
+    regexp: '<logfile>\/(.*)\n.*<!--'
+    replace: '<!--<logfile>/\1-->'
+- replace:
+    dest: "{{eg_install_path}}/conf/opensrf_core.xml"
+    regexp: '-->.*\n(.*)<loglevel>'
+    replace: '<loglevel>'
+- replace:
+    dest: "{{eg_install_path}}/conf/opensrf_core.xml"
+    regexp: '-->.*\n(.*)</gateway>'
+    replace: '</gateway>'