Commit 76f7c7f1 by arbabnazar

change the list into dict

parent 7860c78b
......@@ -17,9 +17,9 @@ tanaguru_download_link: "http://download.tanaguru.org/Tanaguru/tanaguru-3.1.0.i3
fixfox_esr_link: "http://download-origin.cdn.mozilla.net/pub/firefox/releases/24.0esr/linux-x86_64/en-US/firefox-24.0esr.tar.bz2"
tanaguru_parameters:
- tanaguru_database: tgdatabase
tanaguru_db_user: tguser
tanaguru_db_password: "tgPassword"
tanaguru_url: "http://localhost:8080/tanaguru/"
tanaguru_admin_email: "admin@example.com"
tg_admin_passwd: "tanaguru15"
\ No newline at end of file
tanaguru_database: tgdatabase
tanaguru_db_user: tguser
tanaguru_db_password: "tgPassword"
tanaguru_url: "http://localhost:8080/tanaguru/"
tanaguru_admin_email: "admin@example.com"
tg_admin_passwd: "tanaguru15"
\ No newline at end of file
......@@ -82,20 +82,18 @@
- name: Create MySQL database for TanaGuru
mysql_db:
name: "{{ item.tanaguru_database }}"
name: "{{ tanaguru_parameters.tanaguru_database }}"
state: present
encoding: utf8
collation: utf8_general_ci
with_items: tanaguru_parameters
- name: Create MySQL user for TanaGuru
mysql_user:
name: "{{ item.tanaguru_db_user }}"
password: "{{ item.tanaguru_db_password }}"
name: "{{ tanaguru_parameters.tanaguru_db_user }}"
password: "{{ tanaguru_parameters.tanaguru_db_password }}"
host: localhost
priv: "{{ item.tanaguru_database }}.*:ALL"
priv: "{{ tanaguru_parameters.tanaguru_database }}.*:ALL"
state: present
with_items: tanaguru_parameters
- name: Check that tanaguru app is running
shell: >
......@@ -105,19 +103,18 @@
- name: Install the TanaGuru
shell: >
/bin/echo "yes" | ./install.sh --mysql-tg-user "{{ item.tanaguru_db_user }}" \
--mysql-tg-passwd "{{ item.tanaguru_db_password }}" \
--mysql-tg-db "{{ item.tanaguru_database }}" \
--tanaguru-url "{{ item.tanaguru_url }}" \
/bin/echo "yes" | ./install.sh --mysql-tg-user "{{ tanaguru_parameters.tanaguru_db_user }}" \
--mysql-tg-passwd "{{ tanaguru_parameters.tanaguru_db_password }}" \
--mysql-tg-db "{{ tanaguru_parameters.tanaguru_database }}" \
--tanaguru-url "{{ tanaguru_parameters.tanaguru_url }}" \
--tomcat-webapps /var/lib/tomcat6/webapps \
--tomcat-user tomcat6 \
--tg-admin-email "{{ item.tanaguru_admin_email }}" \
--tg-admin-passwd "{{ item.tg_admin_passwd }}" \
--tg-admin-email "{{ tanaguru_parameters.tanaguru_admin_email }}" \
--tg-admin-passwd "{{ tanaguru_parameters.tg_admin_passwd }}" \
--firefox-esr-path /opt/firefox/firefox \
--display-port ":99.1"
args:
chdir: "~/{{ tanaguru_download_link | basename | regex_replace('.tar.gz$', '') }}"
with_items: tanaguru_parameters
when: "tanaguru_app.stdout.find('/etc/tanaguru/') == -1"
notify:
- restart tomcat6
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment