more vars, better separation

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

diff --git a/evergreen/apache.yml b/evergreen/apache.yml
index 97cdf36..92384d9 100644 (file)
--- a/evergreen/apache.yml
+++ b/evergreen/apache.yml
@@ -28,7 +28,7 @@
   shell: >
     cd /etc/apache2/ssl
     && openssl req -new -x509 -days 365 -nodes -out server.crt
-    -keyout server.key -subj "/C=XX/ST=XX/L=XX/O=XX/OU=XX/CN={{domain_name}}"
+    -keyout server.key -subj "/C=XX/ST=XX/L=XX/O=XX/OU=XX/CN={{web_domain}}"
 - name: Disable mpm_event
   become: true
   shell: /usr/sbin/a2dismod mpm_event

diff --git a/opensrf/ejabberd.yml b/opensrf/ejabberd.yml
index b4f6f87..9d36259 100644 (file)
--- a/opensrf/ejabberd.yml
+++ b/opensrf/ejabberd.yml
@@ -10,21 +10,21 @@
 - name: Wait a moment for Ejabberd
   pause: seconds=5
 - block:
-  - name: Unregister Ejabberd user router@private.localhost
-    shell: ejabberdctl unregister router private.localhost
-  - name: Unregister Ejabberd user opensrf@private.localhost
-    shell: ejabberdctl unregister opensrf private.localhost
-  - name: Unregister Ejabberd user router@public.localhost
-    shell: ejabberdctl unregister router public.localhost
-  - name: Unregister Ejabberd user opensrf@public.localhost
-    shell: ejabberdctl unregister opensrf public.localhost
-  - name: Register Ejabberd user router@private.localhost
-    shell: ejabberdctl register router private.localhost {{ejabberd_password}}
-  - name: Register Ejabberd user opensrf@private.localhost
-    shell: ejabberdctl register opensrf private.localhost {{ejabberd_password}}
-  - name: Register Ejabberd user router@public.localhost
-    shell: ejabberdctl register router public.localhost {{ejabberd_password}}
-  - name: Register Ejabberd user opensrf@public.localhost
-    shell: ejabberdctl register opensrf public.localhost {{ejabberd_password}}
+  - name: Unregister Ejabberd user router@private.{{jabber_domain}}
+    shell: ejabberdctl unregister router private.{{jabber_domain}}
+  - name: Unregister Ejabberd user opensrf@private.{{jabber_domain}}
+    shell: ejabberdctl unregister opensrf private.{{jabber_domain}}
+  - name: Unregister Ejabberd user router@public.{{jabber_domain}}
+    shell: ejabberdctl unregister router public.{{jabber_domain}}
+  - name: Unregister Ejabberd user opensrf@public.{{jabber_domain}}
+    shell: ejabberdctl unregister opensrf public.{{jabber_domain}}
+  - name: Register Ejabberd user router@private.{{jabber_domain}}
+    shell: ejabberdctl register router private.{{jabber_domain}} {{ejabberd_password}}
+  - name: Register Ejabberd user opensrf@private.{{jabber_domain}}
+    shell: ejabberdctl register opensrf private.{{jabber_domain}} {{ejabberd_password}}
+  - name: Register Ejabberd user router@public.{{jabber_domain}}
+    shell: ejabberdctl register router public.{{jabber_domain}} {{ejabberd_password}}
+  - name: Register Ejabberd user opensrf@public.{{jabber_domain}}
+    shell: ejabberdctl register opensrf public.{{jabber_domain}} {{ejabberd_password}}
   become: true
   become_user: ejabberd

diff --git a/opensrf/setup.yml b/opensrf/setup.yml
index 131dc93..19ada33 100644 (file)
--- a/opensrf/setup.yml
+++ b/opensrf/setup.yml
@@ -29,15 +29,9 @@
     dest: /home/opensrf/.bash_profile
     regexp: '^export LD_LIBRARY_PATH=' 
     line: 'export LD_LIBRARY_PATH="{{eg_install_path}}/lib:/usr/local/lib:/usr/local/lib/dbd:$LD_LIBRARY_PATH"'
-- name: Check /etc/hosts file for public.{{domain_name}}
+- name: Add public/private jabber hosts to /etc/hosts
   become: true
   lineinfile: 
     dest: /etc/hosts
-    regexp: '^127.0.1.2'
-    line: '127.0.1.2    public.{{domain_name}}'
-- name: Check /etc/hosts file for private.{{domain_name}}
-  become: true
-  lineinfile: 
-    dest: /etc/hosts
-    regexp: '^127.0.1.3'
-    line: '127.0.1.3    private.{{domain_name}}'
+    regexp: '^{{jabber_domain_addr}} public'
+    line: '{{jabber_domain_addr}} public.{{jabber_domain}} private.{{jabber_domain}}'

diff --git a/settings.yml b/settings.yml
index cc2cc69..13d7de9 100644 (file)
--- a/settings.yml
+++ b/settings.yml
@@ -1,7 +1,7 @@
 ---
 hosts: '127.0.0.1'
 deploy_user: opensrf
-repo_base: /home/opensrf
+repo_base: /home/{{deploy_user}}
 os_build_target: ubuntu-xenial 
 osrf_git_repository: git://git.evergreen-ils.org/OpenSRF.git
 eg_git_repository: git://git.evergreen-ils.org/Evergreen.git
@@ -15,8 +15,15 @@ eg_install_path: /openils
 eg_stamp_id: master
 eg_admin_user: admin
 eg_admin_pass: demo123
+
 ejabberd_password: password
-domain_name: localhost
+jabber_domain: localhost
+jabber_domain_addr: 127.0.1.2
+
+# Host domain used by web clients.
+# TODO add to apache eg.conf ServerName
+web_domain: localhost
+# TODO add cache servers to opensrf.xml/eg_vhost.conf
 opensrf_memcached_server: ["127.0.0.1:11211"]
 dojo_version: 1.3.3
 dojo_url: http://download.dojotoolkit.org/release-{{dojo_version}}/dojo-release-{{dojo_version}}.tar.gz
@@ -46,10 +53,10 @@ database_database: evergreen
 create_schema: true
 
 # set to empty value to avoid loading sample data
-# Requires create_schema:true
+# Only used when create_schema=true
 load_sample_data: --load-all-sample
 
 # Install the PGTAP extension for database unit tests?
-# Requires create_schema:true
+# Requires create_schema=true
 install_pgtap: true
 # --------------------------------------------------------------------------