Only setup translations if variable is set

Some fixes and rearrangement of things to allow for proper building
without translation by default or with translation as per the new
README step.

Signed-off-by: Ben Shum <ben@evergreener.net>

diff --git a/evergreen/apache.yml b/evergreen/apache.yml
index 771872a..d8b0adc 100644 (file)
--- a/evergreen/apache.yml
+++ b/evergreen/apache.yml
@@ -9,32 +9,6 @@
   copy:
     src: "{{repo_base}}/Evergreen/Open-ILS/examples/apache_24/eg_vhost_24.conf"
     dest: /etc/apache2/eg_vhost.conf 
-- name: Setup locale(s) for TPAC
-  vars:
-    eg_locale: "{{ item | lower | regex_replace('(\\w{2})-(\\w{2})', '\\1_\\2') }}"
-  when: locale is defined
-  blockinfile:
-    dest: /etc/apache2/eg_vhost.conf
-    insertafter: '    #PerlAddVar OILSWebLocale "/openils/var/data/locale/opac/fr-CA.po"'
-    marker: "# {mark} ANSIBLE MANAGED BLOCK TPAC {{ item }}"
-    block: |
-      PerlAddVar OILSWebLocale "{{ eg_locale }}"
-      PerlAddVar OILSWebLocale "/openils/var/data/locale/opac/{{ item }}.po"
-    with_items: "{{ locale }}"
-    when: locale is defined
-- name: Setup locale(s) for web staff client
-  vars:
-    staff_eg_locale: "{{ item | lower | regex_replace('(\\w{2})-(\\w{2})', '\\1_\\2') }}"
-  when: locale is defined
-  blockinfile:
-    dest: /etc/apache2/eg_vhost.conf
-    insertafter: '    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/fr-CA.po"'
-    marker: "# {mark} ANSIBLE MANAGED BLOCK WEBSTAFF {{ item }}"
-    block: |
-      PerlAddVar OILSWebLocale "{{ staff_eg_locale }}"
-      PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/{{ item }}.po"
-    with_items: "{{ locale }}"
-    when: locale is defined
 - name: Setup eg_startup
   copy:
     src: "{{repo_base}}/Evergreen/Open-ILS/examples/apache/eg_startup"

diff --git a/evergreen/database.yml b/evergreen/database.yml
index 8b105b5..b169a34 100644 (file)
--- a/evergreen/database.yml
+++ b/evergreen/database.yml
@@ -61,11 +61,3 @@
   when: 
     - create_schema
     - install_pgtap
-- name: Install "{{ locale }}" locale(s) in database
-  become: true
-  become_user: postgres
-  shell: >
-    cd {{repo_base}}/Evergreen/Open-ILS/src/sql/Pg
-    && psql -d {{database_database}} -f 950.data.seed-values-{{ item }}.sql
-  with_items: "{{ locale }}"
-  when: locale is defined

diff --git a/evergreen/main.yml b/evergreen/main.yml
index 810537a..6118e6d 100644 (file)
--- a/evergreen/main.yml
+++ b/evergreen/main.yml
@@ -15,4 +15,6 @@
 - name: Install Database
   include: database.yml
   when: install_database
-
+- name: Setup translations
+  include: setup-translations.yml
+  when: locale is defined

diff --git a/evergreen/setup-translations.yml b/evergreen/setup-translations.yml
new file mode 100644 (file)
index 0000000..3548911
--- /dev/null
+++ b/evergreen/setup-translations.yml
@@ -0,0 +1,36 @@
+# Apache translations
+- name: Assign variable for locale(s) for TPAC
+  vars:
+    eg_locale: "{{ item | lower | regex_replace('(\\w{2})-(\\w{2})', '\\1_\\2') }}"
+  blockinfile:
+    dest: /etc/apache2/eg_vhost.conf
+    insertafter: '    #PerlAddVar OILSWebLocale "/openils/var/data/locale/opac/fr-CA.po"'
+    marker: "# {mark} ANSIBLE MANAGED BLOCK TPAC {{ item }}"
+    block: |
+      PerlAddVar OILSWebLocale "{{ eg_locale }}"
+      PerlAddVar OILSWebLocale "/openils/var/data/locale/opac/{{ item }}.po"
+  with_items: "{{ locale }}"
+  when: locale is defined
+- name: Setup locale(s) for web staff client
+  vars:
+    staff_eg_locale: "{{ item | lower | regex_replace('(\\w{2})-(\\w{2})', '\\1_\\2') }}"
+  blockinfile:
+    dest: /etc/apache2/eg_vhost.conf
+    insertafter: '    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/fr-CA.po"'
+    marker: "# {mark} ANSIBLE MANAGED BLOCK WEBSTAFF {{ item }}"
+    block: |
+      PerlAddVar OILSWebLocale "{{ staff_eg_locale }}"
+      PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/{{ item }}.po"
+  with_items: "{{ locale }}"
+  when: locale is defined
+
+# Database translations
+- name: Install "{{ locale }}" locale(s) in database
+  with_items: "{{ locale }}"
+  when: locale is defined
+  become: true
+  become_user: postgres
+  shell: >
+    cd {{repo_base}}/Evergreen/Open-ILS/src/sql/Pg
+    && psql -d {{database_database}} -f 950.data.seed-values-{{ item }}.sql
+