Make web ui tenant configurable

README.md

@@ -40,6 +40,8 @@ Contains Ansible playbook for the deployment of the ARGO Web UI service. The pla
 - Edit inventory and replace `webui.node` with the hostname that you intend to deploy the Web UI onto. 
 - Edit `roles/webui/vars/main.yml` file and change the values of the `certificate_password` and `keystore_password` variables to a stronger value.
 
+- Note that by default the EGI based web UI will be deployed on your target node. To change this behaviour use the `argo_web` and `branch_name` variables within the `roles/webui/vars/main.yml` file to point to another upstream lavoisier repository. 
+
 ### Prerequisites
 
 - Deploy against CentOS 7.x node

roles/webui/defaults/main.yml

@@ -5,7 +5,8 @@ services:
   - https
 
 lavoisier_home: /var/www/lavoisier
-download_url: https://github.com/ARGOeu/argo-egi-web/archive/master.zip
+branch_name: master
+argo_web: argo-egi-web
 
 cert_dir: /etc/grid-security
 cert_path: /etc/grid-security/hostcert.pem

roles/webui/handlers/main.yml

@@ -2,5 +2,5 @@
 
 - name: restart webui
   command: ./bin/lavoisier.sh restart
-           chdir={{ lavoisier_home }}/argo-egi-web-master
+           chdir={{ lavoisier_home }}/{{ argo_web }}-{{ branch_name }}
   ignore_errors: True

roles/webui/tasks/main.yml

@@ -24,39 +24,39 @@
   file: path={{ lavoisier_home }} state=directory
 
 - name: Download lavoisier zip file
-  get_url: url={{ download_url }}
-           dest={{ lavoisier_home }}/master.zip
+  get_url: url=https://github.com/ARGOeu/{{ argo_web }}/archive/{{ branch_name }}.zip
+           dest={{ lavoisier_home }}/{{ branch_name }}.zip
            mode=0640
   register: download_out
   notify: restart webui
 
 - name: Stage old directory if download target has changed
-  command: mv argo-egi-web-master argo-egi-web-master.old
+  command: mv {{ argo_web }}-{{ branch_name }} {{ argo_web }}-{{ branch_name }}.old
            chdir={{ lavoisier_home }}
   when: download_out is defined and download_out.changed
   ignore_errors: True
 
 - name: Unzip zip file
-  command: unzip master.zip
+  command: unzip {{ branch_name }}.zip
            chdir={{ lavoisier_home }}
   when: download_out is defined and download_out.changed
 
 - name: Configure etc/lavoisier-hidden.properties step 1
-  lineinfile: dest={{ lavoisier_home }}/argo-egi-web-master/etc/lavoisier-hidden.properties
+  lineinfile: dest={{ lavoisier_home }}/{{ argo_web }}-{{ branch_name }}/etc/lavoisier-hidden.properties
               line='certificate.password={{ certificate_password }}'
               regexp='^certificate.password'
               state=present
   notify: restart webui
 
 - name: Configure etc/lavoisier-hidden.properties step 2
-  lineinfile: dest={{ lavoisier_home }}/argo-egi-web-master/etc/lavoisier-hidden.properties
+  lineinfile: dest={{ lavoisier_home }}/{{ argo_web }}-{{ branch_name }}/etc/lavoisier-hidden.properties
               line='certificate.path={{ certificate_path }}'
               regexp='^certificate.path'
               state=present
   notify: restart webui
 
 - name: Configure etc/lavoisier-hidden.properties step 3
-  lineinfile: dest={{ lavoisier_home }}/argo-egi-web-master/etc/lavoisier-hidden.properties
+  lineinfile: dest={{ lavoisier_home }}/{{ argo_web }}-{{ branch_name }}/etc/lavoisier-hidden.properties
               line='cache.baseDirectory={{ cache_directory }}'
               regexp='^cache.baseDirectory='
               state=present
@@ -64,35 +64,35 @@
   notify: restart webui
 
 - name: Configure etc/lavoisier-hidden.properties step 4
-  lineinfile: dest={{ lavoisier_home }}/argo-egi-web-master/etc/lavoisier-hidden.properties
+  lineinfile: dest={{ lavoisier_home }}/{{ argo_web }}-{{ branch_name }}/etc/lavoisier-hidden.properties
               line='server.baseUrl=http://{{ inventory_hostname }}'
               regexp='^server.baseUrl'
               state=present
   notify: restart webui
 
 - name: Configure etc/lavoisier-hidden.properties step 5
-  lineinfile: dest={{ lavoisier_home }}/argo-egi-web-master/etc/lavoisier-hidden.properties
+  lineinfile: dest={{ lavoisier_home }}/{{ argo_web }}-{{ branch_name }}/etc/lavoisier-hidden.properties
               line='lavoisier.ssl.trustStore={{ truststore_path }}'
               regexp='^lavoisier.ssl.trustStore='
               state=present
   notify: restart webui
 
 - name: Configure etc/lavoisier-hidden.properties step 6
-  lineinfile: dest={{ lavoisier_home }}/argo-egi-web-master/etc/lavoisier-hidden.properties
+  lineinfile: dest={{ lavoisier_home }}/{{ argo_web }}-{{ branch_name }}/etc/lavoisier-hidden.properties
               line='lavoisier.ssl.keyStore={{ keystore_path }}'
               regexp='^lavoisier.ssl.keyStore='
               state=present
   notify: restart webui
 
 - name: Configure etc/lavoisier-hidden.properties step 7
-  lineinfile: dest={{ lavoisier_home }}/argo-egi-web-master/etc/lavoisier-hidden.properties
+  lineinfile: dest={{ lavoisier_home }}/{{ argo_web }}-{{ branch_name }}/etc/lavoisier-hidden.properties
               line='lavoisier.ssl.keyStorePassword={{ keystore_password }}'
               regexp='^lavoisier.ssl.keyStorePassword='
               state=present
   notify: restart webui
 
 - name: Configure etc/security/passwords.properties
-  lineinfile: dest={{ lavoisier_home }}/argo-egi-web-master/etc/security/passwords.properties
+  lineinfile: dest={{ lavoisier_home }}/{{ argo_web }}-{{ branch_name }}/etc/security/passwords.properties
               line='admin={{ admin_password_md5 }}'
               regexp='^admin'
               state=present
@@ -100,5 +100,5 @@
 
 - name: Start webui
   command: ./bin/lavoisier.sh start
-           chdir={{ lavoisier_home }}/argo-egi-web-master
+           chdir={{ lavoisier_home }}/{{ argo_web }}-{{ branch_name }}
   ignore_errors: True