From: Bill Erickson <berickxx@gmail.com>
Date: Mon, 1 Oct 2018 15:37:49 +0000 (-0400)
Subject: Ansible uses XUL series ID for server ID
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a39e463f782f4d7e237398585b5e7fac5c741893;p=working%2FEvergreen.git

Ansible uses XUL series ID for server ID

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

diff --git a/KCLS/admin-scripts/ansible/plays/deploy.yml b/KCLS/admin-scripts/ansible/plays/deploy.yml
index d47e6ed9af..0907b2ddc7 100644
--- a/KCLS/admin-scripts/ansible/plays/deploy.yml
+++ b/KCLS/admin-scripts/ansible/plays/deploy.yml
@@ -65,7 +65,7 @@
       PATH: "{{ansible_env.PATH}}:{{eg_install_path}}/bin"
     shell: >
       cd {{repo_base}}/Evergreen 
-      && make STAFF_CLIENT_STAMP_ID={{eg_stamp_id}} STAFF_CLIENT_VERSION={{eg_stamp_id}} install
+      && make STAFF_CLIENT_STAMP_ID={{eg_series_id}} STAFF_CLIENT_BUILD_ID={{eg_stamp_id}} STAFF_CLIENT_VERSION={{eg_stamp_id}} install
   - name: Set ownership of {{repo_base}}/Evergreen to {{opensrf_user}}
     become: true
     file: dest={{repo_base}}/Evergreen owner={{opensrf_user}} group={{opensrf_user}} recurse=yes
@@ -140,6 +140,14 @@
     file:
       path: '{{eg_install_path}}/var/web/xul/builds/build'
       state: absent
+# XUL names the install directory the same as the series ID
+# We want the install directory to be named the stamp/version ID
+# so we have a directory for each version installed instead of
+# clobber with every install.
+  - name: Rename XUL build {{eg_series_id}} to {{eg_stamp_id}}
+    become: true
+    become_user: '{{opensrf_user}}'
+    shell: cd {{eg_install_path}}/var/web/xul && mv {{eg_series_id}} {{eg_stamp_id}} 
   - name: Create XUL Current Symlink
     become: true
     become_user: '{{opensrf_user}}'