diff --git a/development/hosts b/development/hosts index 5d2c537..6b974b1 100644 --- a/development/hosts +++ b/development/hosts @@ -11,7 +11,7 @@ # Ex 1: Ungrouped hosts, specify before any group headers. [development] -80.155.206.72 +epolsa5069bit03.tpolizei-bw.de diff --git a/group_vars/development.yml b/group_vars/development.yml index 8ed6c80..6126d9b 100644 --- a/group_vars/development.yml +++ b/group_vars/development.yml @@ -9,3 +9,8 @@ sso_host: "Host *.TPOLIZEI-BW.DE" sso_domain_upper: "TPOLIZEI-BW.DE" sso_domain_lower: "tpolizei-bw.de" + + ##hier kann das Verzeichnis geändert werden + ##in den die Anwendung deployed + ##vor allem gut für testzwecke + base_dir: "/opt/rola/ams" diff --git a/group_vars/production.yml b/group_vars/production.yml index ed3091c..f221beb 100644 --- a/group_vars/production.yml +++ b/group_vars/production.yml @@ -9,6 +9,8 @@ sso_host: "Host *.POLIZEI-BW.NET" sso_domain_upper: "POLIZEI-BW.NET" sso_domain_lower: "polizei-bw.net" + + base_dir: "/opt/rola/ams" diff --git a/group_vars/qs.yml b/group_vars/qs.yml index 2d67e82..af7fec9 100644 --- a/group_vars/qs.yml +++ b/group_vars/qs.yml @@ -13,6 +13,8 @@ sso_domain_upper: "TPOLIZEI-BW.DE" sso_domain_lower: "tpolizei-bw.de" + base_dir: "/opt/rola/ams" + diff --git a/group_vars/teaching.yml b/group_vars/teaching.yml index 9c58d3e..f3c9eeb 100644 --- a/group_vars/teaching.yml +++ b/group_vars/teaching.yml @@ -9,3 +9,5 @@ sso_host: "Host *.SPOLIZEI-BW.EDU" sso_domain_upper: "SPOLIZEI-BW.EDU" sso_domain_lower: "spolizei-bw.edu" + + base_dir: "/opt/rola/ams" diff --git a/host_vars/epolsa5069bit03.yml b/host_vars/epolsa5069bit03.tpolizei-bw.de.yml similarity index 100% rename from host_vars/epolsa5069bit03.yml rename to host_vars/epolsa5069bit03.tpolizei-bw.de.yml diff --git a/host_vars/epolsa5073bit03.yml b/host_vars/epolsa5073bit03.tpolizei-bw.de.yml similarity index 100% rename from host_vars/epolsa5073bit03.yml rename to host_vars/epolsa5073bit03.tpolizei-bw.de.yml diff --git a/host_vars/polsa5079bit03.yml b/host_vars/polsa5079bit03.polizei-bw.net.yml similarity index 100% rename from host_vars/polsa5079bit03.yml rename to host_vars/polsa5079bit03.polizei-bw.net.yml diff --git a/host_vars/polsa5079stu02.yml b/host_vars/polsa5079stu02.polizei-bw.net.yml similarity index 100% rename from host_vars/polsa5079stu02.yml rename to host_vars/polsa5079stu02.polizei-bw.net.yml diff --git a/host_vars/spolsa5069stu02.yml b/host_vars/spolsa5069stu02.spolizei-bw.edu.yml similarity index 100% rename from host_vars/spolsa5069stu02.yml rename to host_vars/spolsa5069stu02.spolizei-bw.edu.yml diff --git a/production/hosts b/production/hosts index 9180034..f9214af 100644 --- a/production/hosts +++ b/production/hosts @@ -11,8 +11,7 @@ # Ex 1: Ungrouped hosts, specify before any group headers. [production] -80.155.207.111 -80.155.207.161 - +polsa5079bit03.polizei-bw.net +polsa5079stu02.polizei-bw.net diff --git a/qs/hosts b/qs/hosts index e3ba2a9..7b75322 100644 --- a/qs/hosts +++ b/qs/hosts @@ -11,7 +11,4 @@ # Ex 1: Ungrouped hosts, specify before any group headers. [qs] -80.155.206.80 - - - +epolsa5073bit03.tpolizei-bw.de diff --git a/roles/ams_0016_14.1.2.0/tasks/main.yml b/roles/ams_0016_14.1.2.0/tasks/main.yml index 964490f..93c20c0 100644 --- a/roles/ams_0016_14.1.2.0/tasks/main.yml +++ b/roles/ams_0016_14.1.2.0/tasks/main.yml @@ -1,32 +1,32 @@ --- #ams - - name: create folder /opt/rola/ams + - name: create folder "{{ base_dir }}" file: - path: /opt/rola/ams + path: "{{ base_dir }}" state: directory mode: '0755' owner: jetty group: dba - - name: create folder /opt/rola/ams/linux + - name: create folder "{{ base_dir }}/linux" file: - path: /opt/rola/ams/linux + path: "{{ base_dir }}/linux" state: directory mode: '0755' owner: jetty group: dba - - name: create folder /opt/rola/ams/linux/Appserver + - name: create folder "{{ base_dir }}/linux/Appserver" file: - path: /opt/rola/ams/linux/Appserver + path: "{{ base_dir }}/linux/Appserver" state: directory mode: '0755' owner: jetty group: dba - - name: create folder /opt/rola/ams/linux/Services + - name: create folder "{{ base_dir }}/linux/Services" file: - path: /opt/rola/ams/linux/Services + path: "{{ base_dir }}/linux/Services" state: directory mode: '0755' owner: jetty @@ -35,7 +35,7 @@ - name: unarchive /sw/AMS/WEB/0016_14.1.2.0_AMS/1202153903_RS-97187_0016_14.1.2.0_AMS_1_6_BW_mit_Migration/linux/Appserver.tar.gz unarchive: src: /sw/AMS/WEB/0016_14.1.2.0_AMS/1202153903_RS-97187_0016_14.1.2.0_AMS_1_6_BW_mit_Migration/linux/Appserver.tar.gz - dest: /opt/rola/ams/linux/Appserver/ + dest: "{{ base_dir }}/linux/Appserver/" remote_src: yes owner: jetty group: dba @@ -43,14 +43,14 @@ - name: unarchive /sw/AMS/WEB/0016_14.1.2.0_AMS/1202153903_RS-97187_0016_14.1.2.0_AMS_1_6_BW_mit_Migration/linux/Services.tar.gz unarchive: src: /sw/AMS/WEB/0016_14.1.2.0_AMS/1202153903_RS-97187_0016_14.1.2.0_AMS_1_6_BW_mit_Migration/linux/Services.tar.gz - dest: /opt/rola/ams/linux/Services/ + dest: "{{ base_dir }}/linux/Services/" remote_src: yes owner: jetty group: dba - name: create folder webclient-services file: - path: /opt/rola/ams/linux/webclient-services + path: "{{ base_dir }}/linux/webclient-services" state: directory mode: '0755' owner: jetty @@ -59,7 +59,7 @@ - name: tar datei rsAmsBvService-14.1.2.0.tar.gz entpacken unarchive: src: /sw/AMS/WEB/0016_14.1.2.0_AMS/1202153903_RS-97187_0016_14.1.2.0_AMS_1_6_BW_mit_Migration/linux/webclient-services/rsAmsBvService-14.1.2.0.tar.gz - dest: /opt/rola/ams/linux/webclient-services/ + dest: "{{ base_dir }}/linux/webclient-services/" remote_src: yes owner: jetty group: dba @@ -67,7 +67,7 @@ - name: tar datei SharedComponents-14.1.2.0.tar.gz entpacken unarchive: src: /sw/AMS/WEB/0016_14.1.2.0_AMS/1202153903_RS-97187_0016_14.1.2.0_AMS_1_6_BW_mit_Migration/linux/webclient-services/SharedComponents-14.1.2.0.tar.gz - dest: /opt/rola/ams/linux/webclient-services/ + dest: "{{ base_dir }}/linux/webclient-services/" remote_src: yes owner: jetty group: dba @@ -76,86 +76,86 @@ - name: Template file pwdAppserver.xml.j2 with owner and permissions template: src: pwd_Appserver.xml.j2 - dest: /opt/rola/ams/linux/Appserver/config/pwd.xml + dest: "{{ base_dir }}/linux/Appserver/config/pwd.xml" owner: jetty group: dba mode: '0644' - name: Template file rsWebserviceAppserver.xml.j2 with owner and permissions template: src: rsWebserviceAppserver.xml.j2 - dest: /opt/rola/ams/linux/Appserver/config/rsWebserviceAppserver.xml + dest: "{{ base_dir }}/linux/Appserver/config/rsWebserviceAppserver.xml" owner: jetty group: dba mode: '0644' - - name: Template file rsWebserviceAppserver.conf.j2 to /opt/rola/ams/linux/Appserver/service/config/rsWebserviceAppserver.conf + - name: Template file rsWebserviceAppserver.conf.j2 to "{{ base_dir }}/linux/Appserver/service/config/rsWebserviceAppserver.conf" template: src: rsWebserviceAppserver.conf.j2 - dest: /opt/rola/ams/linux/Appserver/service/config/rsWebserviceAppserver.conf + dest: "{{ base_dir }}/linux/Appserver/service/config/rsWebserviceAppserver.conf" owner: jetty group: dba mode: '0644' - name: Template file pwd_ServiceIMP.xml.j2 with owner and permissions template: src: pwd_ServiceIMP.xml.j2 - dest: /opt/rola/ams/linux/Services/config/pwd.xml + dest: "{{ base_dir }}/linux/Services/config/pwd.xml" owner: jetty group: dba mode: '0644' - name: Copy file rsWebserviceImp20.xml.j2 with owner and permissions template: src: rsWebserviceImp20.xml.j2 - dest: /opt/rola/ams/linux/Services/config/rsWebserviceImp20.xml + dest: "{{ base_dir }}/linux/Services/config/rsWebserviceImp20.xml" owner: jetty group: dba mode: '0644' - name: Template file rsWebserviceImp20.conf.j2 with owner and permissions template: src: rsWebserviceImp20.conf.j2 - dest: /opt/rola/ams/linux/Services/service/config/rsWebserviceImp20.conf + dest: "{{ base_dir }}/linux/Services/service/config/rsWebserviceImp20.conf" owner: jetty group: dba mode: '0644' - name: Template file rsAmsBvService.conf.j2 with owner and permissions template: src: rsAmsBvService.conf.j2 - dest: /opt/rola/ams/linux/webclient-services/rsAmsBvService-14.1.2.0/service/config/rsAmsBvService.conf + dest: "{{ base_dir }}/linux/webclient-services/rsAmsBvService-14.1.2.0/service/config/rsAmsBvService.conf" owner: jetty group: dba mode: '0644' - name: Template file tech.database.yaml.j2 with owner and permissions template: src: tech.database.yaml.j2 - dest: /opt/rola/ams/linux/webclient-services/rsAmsBvService-14.1.2.0/frameworkconfig/prefs/tech.database.yaml + dest: "{{ base_dir }}/linux/webclient-services/rsAmsBvService-14.1.2.0/frameworkconfig/prefs/tech.database.yaml" owner: jetty group: dba mode: '0644' - name: Template file jetty.xml.j2 for Appserver with owner and permissions template: src: jetty.xml.j2 - dest: /opt/rola/ams/linux/Appserver/frameworkconfig/jetty_home/etc/jetty.xml + dest: "{{ base_dir }}/linux/Appserver/frameworkconfig/jetty_home/etc/jetty.xml" owner: jetty group: dba mode: '0644' - name: Template file jetty.xml.j2 for Services with owner and permissions template: src: jetty.xml.j2 - dest: /opt/rola/ams/linux/Services/frameworkconfig/jetty_home/etc/jetty.xml + dest: "{{ base_dir }}/linux/Services/frameworkconfig/jetty_home/etc/jetty.xml" owner: jetty group: dba mode: '0644' - - name: copy common.xml to /opt/rola/ams/linux/Appserver/config + - name: copy common.xml to "{{ base_dir }}/linux/Appserver/config" copy: src: common.xml - dest: /opt/rola/ams/linux/Appserver/config/common.xml + dest: "{{ base_dir }}/linux/Appserver/config/common.xml" owner: jetty group: dba mode: '0644' - - name: copy common.xml to /opt/rola/ams/linux/Services/config + - name: copy common.xml to "{{ base_dir }}/linux/Services/config" copy: src: common.xml - dest: /opt/rola/ams/linux/Services/config/common.xml + dest: "{{ base_dir }}/linux/Services/config/common.xml" owner: jetty group: dba mode: '0644' diff --git a/roles/ams_0016_14.1.2.0_AdminServer/tasks/main.yml b/roles/ams_0016_14.1.2.0_AdminServer/tasks/main.yml index 455e868..7110fc0 100644 --- a/roles/ams_0016_14.1.2.0_AdminServer/tasks/main.yml +++ b/roles/ams_0016_14.1.2.0_AdminServer/tasks/main.yml @@ -1,7 +1,7 @@ --- - - name: create folder /opt/rola/ams/linux/Appserveradmin + - name: create folder "{{ base_dir }}/linux/Appserveradmin" file: - path: /opt/rola/ams/linux/Appserveradmin + path: "{{ base_dir }}/linux/Appserveradmin" state: directory mode: '0755' owner: jetty @@ -10,15 +10,15 @@ - name: unarchive /sw/AMS/WEB/0016_14.1.2.0_AMS/1202153903_RS-97187_0016_14.1.2.0_AMS_1_6_BW_mit_Migration/linux/Appserver.tar.gz unarchive: src: /sw/AMS/WEB/0016_14.1.2.0_AMS/1202153903_RS-97187_0016_14.1.2.0_AMS_1_6_BW_mit_Migration/linux/Appserver.tar.gz - dest: /opt/rola/ams/linux/Appserveradmin/ + dest: "{{ base_dir }}/linux/Appserveradmin/" remote_src: yes owner: jetty group: dba - - name: copy common.xml to /opt/rola/ams/linux/Appserveradmin/config + - name: copy common.xml to "{{ base_dir }}/linux/Appserveradmin/config" copy: src: common.xml - dest: /opt/rola/ams/linux/Appserveradmin/config/common.xml + dest: "{{ base_dir }}/linux/Appserveradmin/config/common.xml" owner: jetty group: dba mode: '0644' @@ -34,28 +34,28 @@ - name: Template file pwdAppserver.xml.j2 with owner and permissions template: src: pwd_Appserver.xml.j2 - dest: /opt/rola/ams/linux/Appserveradmin/config/pwd.xml + dest: "{{ base_dir }}/linux/Appserveradmin/config/pwd.xml" owner: jetty group: dba mode: '0644' - name: Template file rsWebserviceAppserver.xml.j2 with owner and permissions template: src: rsWebserviceAppserver.xml.j2 - dest: /opt/rola/ams/linux/Appserveradmin/config/rsWebserviceAppserver.xml + dest: "{{ base_dir }}/linux/Appserveradmin/config/rsWebserviceAppserver.xml" owner: jetty group: dba mode: '0644' - - name: Template file rsWebserviceAppserver.conf.j2 to /opt/rola/ams/linux/Appserveradmin/service/config/rsWebserviceAppserver.conf + - name: Template file rsWebserviceAppserver.conf.j2 to "{{ base_dir }}/linux/Appserveradmin/service/config/rsWebserviceAppserver.conf" template: src: rsWebserviceAppserver.conf.j2 - dest: /opt/rola/ams/linux/Appserveradmin/service/config/rsWebserviceAppserver.conf + dest: "{{ base_dir }}/linux/Appserveradmin/service/config/rsWebserviceAppserver.conf" owner: jetty group: dba mode: '0644' - name: Template file jetty.xml.j2 for Appserveradmin with owner and permissions template: src: jetty.xml.j2 - dest: /opt/rola/ams/linux/Appserveradmin/frameworkconfig/jetty_home/etc/jetty.xml + dest: "{{ base_dir }}/linux/Appserveradmin/frameworkconfig/jetty_home/etc/jetty.xml" owner: jetty group: dba mode: '0644' diff --git a/teaching/hosts b/teaching/hosts index 7aade9f..c88225c 100644 --- a/teaching/hosts +++ b/teaching/hosts @@ -11,7 +11,6 @@ # Ex 1: Ungrouped hosts, specify before any group headers. [teaching] -80.155.205.161 - +spolsa5069stu02.spolizei-bw.edu