diff --git a/group_vars/development.yml b/group_vars/development.yml index 6126d9b..72d9225 100644 --- a/group_vars/development.yml +++ b/group_vars/development.yml @@ -13,4 +13,4 @@ ##hier kann das Verzeichnis geändert werden ##in den die Anwendung deployed ##vor allem gut für testzwecke - base_dir: "/opt/rola/ams" + base_dir: "/opt/rola/ams0017" diff --git a/playbook.yml b/playbook.yml index faa4af4..b3a2e20 100644 --- a/playbook.yml +++ b/playbook.yml @@ -76,11 +76,10 @@ ##- ams_0015_8.0.9.0 ##- ams_0017_14.1.4.0 ##- ams_0017_14.1.4.0_AdminServer - #- ams_0019_14.1.6.0 - #- ams_0019_14.1.6.0_AdminServer - #- enable_import_cv_xml - ##- disable_import_cv_xml - - ams_0019_14.1.6.0_monitoring + - ams_0019_14.1.6.0 + - ams_0019_14.1.6.0_AdminServer + - enable_import_cv_xml + #- disable_import_cv_xml #handlers: #- name: stopALL diff --git a/roles/ams_0019_14.1.6.0_monitoring/.travis.yml b/roles/ams_0019_14.1.6.0_enable_monitoring/.travis.yml similarity index 100% rename from roles/ams_0019_14.1.6.0_monitoring/.travis.yml rename to roles/ams_0019_14.1.6.0_enable_monitoring/.travis.yml diff --git a/roles/ams_0019_14.1.6.0_monitoring/README.md b/roles/ams_0019_14.1.6.0_enable_monitoring/README.md similarity index 100% rename from roles/ams_0019_14.1.6.0_monitoring/README.md rename to roles/ams_0019_14.1.6.0_enable_monitoring/README.md diff --git a/roles/ams_0019_14.1.6.0_monitoring/defaults/main.yml b/roles/ams_0019_14.1.6.0_enable_monitoring/defaults/main.yml similarity index 100% rename from roles/ams_0019_14.1.6.0_monitoring/defaults/main.yml rename to roles/ams_0019_14.1.6.0_enable_monitoring/defaults/main.yml diff --git a/roles/ams_0019_14.1.6.0_monitoring/dokumentation/Betriebshandbuch.pdf b/roles/ams_0019_14.1.6.0_enable_monitoring/dokumentation/Betriebshandbuch.pdf similarity index 100% rename from roles/ams_0019_14.1.6.0_monitoring/dokumentation/Betriebshandbuch.pdf rename to roles/ams_0019_14.1.6.0_enable_monitoring/dokumentation/Betriebshandbuch.pdf diff --git a/roles/ams_0019_14.1.6.0_monitoring/dokumentation/Releasedokumentation_0016.pdf b/roles/ams_0019_14.1.6.0_enable_monitoring/dokumentation/Releasedokumentation_0016.pdf similarity index 100% rename from roles/ams_0019_14.1.6.0_monitoring/dokumentation/Releasedokumentation_0016.pdf rename to roles/ams_0019_14.1.6.0_enable_monitoring/dokumentation/Releasedokumentation_0016.pdf diff --git a/roles/ams_0019_14.1.6.0_monitoring/handlers/main.yml b/roles/ams_0019_14.1.6.0_enable_monitoring/handlers/main.yml similarity index 100% rename from roles/ams_0019_14.1.6.0_monitoring/handlers/main.yml rename to roles/ams_0019_14.1.6.0_enable_monitoring/handlers/main.yml diff --git a/roles/ams_0019_14.1.6.0_monitoring/meta/main.yml b/roles/ams_0019_14.1.6.0_enable_monitoring/meta/main.yml similarity index 100% rename from roles/ams_0019_14.1.6.0_monitoring/meta/main.yml rename to roles/ams_0019_14.1.6.0_enable_monitoring/meta/main.yml diff --git a/roles/ams_0019_14.1.6.0_enable_monitoring/tasks/main.yml b/roles/ams_0019_14.1.6.0_enable_monitoring/tasks/main.yml new file mode 100644 index 0000000..24c42f5 --- /dev/null +++ b/roles/ams_0019_14.1.6.0_enable_monitoring/tasks/main.yml @@ -0,0 +1,36 @@ +--- +##hiermit wird das Monitoring eingeschaltet + + - name: Template file rsWebserviceAppserver.xml_enable_mon.j2 with owner and permissions + template: + src: rsWebserviceAppserver.xml_enable_mon.j2 + dest: "{{ base_dir }}/linux/Appserver/config/rsWebserviceAppserver.xml" + owner: jetty + group: dba + mode: '0644' + + - name: Copy file rsWebserviceImp20.xml_enable_mon.j2 with owner and permissions + template: + src: rsWebserviceImp20.xml_enable_mon.j2 + dest: "{{ base_dir }}/linux/Services/config/rsWebserviceImp20.xml" + owner: jetty + group: dba + mode: '0644' + + - name: Template file rsWebserviceAppserverAdmin.xml_enable_mon.j2 with owner and permissions + template: + src: rsWebserviceAppserverAdmin.xml_enable_mon.j2 + dest: "{{ base_dir }}/linux/Appserveradmin/config/rsWebserviceAppserver.xml" + owner: jetty + group: dba + mode: '0644' + + + + + + + + + + diff --git a/roles/ams_0019_14.1.6.0_monitoring/templates/rsWebserviceAppserver.xml_enable_mon.j2 b/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceAppserver.xml_enable_mon.j2 similarity index 77% rename from roles/ams_0019_14.1.6.0_monitoring/templates/rsWebserviceAppserver.xml_enable_mon.j2 rename to roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceAppserver.xml_enable_mon.j2 index cf6293e..64f5210 100644 --- a/roles/ams_0019_14.1.6.0_monitoring/templates/rsWebserviceAppserver.xml_enable_mon.j2 +++ b/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceAppserver.xml_enable_mon.j2 @@ -252,31 +252,62 @@ /etc/krb5.keytab - - true - NORMAL - STANDARD - MON1 - true - false - 10888 - - - - -1 - -1 - false - false - false - true - - false - - -1 - -1 - - true - + + + true + + NORMAL + + + STANDARD + + MON1 + + true + + false + + 10888 + + monadmin + + monadmin + + + + -1 + + -1 + + false + + false + + false + + true + + + + + + false + + + + + + -1 + + + + -1 + + + + + true + diff --git a/roles/ams_0019_14.1.6.0_monitoring/templates/rsWebserviceAppserver.xml.j2 b/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceAppserverAdmin.xml_enable_mon.j2 similarity index 95% rename from roles/ams_0019_14.1.6.0_monitoring/templates/rsWebserviceAppserver.xml.j2 rename to roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceAppserverAdmin.xml_enable_mon.j2 index 949ef85..fd5da7e 100644 --- a/roles/ams_0019_14.1.6.0_monitoring/templates/rsWebserviceAppserver.xml.j2 +++ b/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceAppserverAdmin.xml_enable_mon.j2 @@ -11,9 +11,9 @@ &key; &pwd; &common; - + DBMICLCIOOAEKOLGIPJHJEJFCPOFPNLOPILFHPBPIALGIKJHMNNLCLBBGGBCKOGFAFB - /opt/tmp/ + /opt/tmpadmin/ C:/Programme/Internet Explorer/IEXPLORE.EXE @@ -100,9 +100,9 @@ 0 - rsWebserviceAppServer.log + rsWebserviceAppServeradmin.log - {{ LOG_DIR }}/appserver + {{ LOG_DIR }}/appserveradmin/ false @@ -122,13 +122,13 @@ - /opt/tmp/rsCasePrintTemp + /opt/tmpadmin/rsCasePrintTemp - /opt/tmp/rsCasePrintTemp/PrinterConfigurations + /opt/tmpadmin/rsCasePrintTemp/PrinterConfigurations @@ -245,16 +245,16 @@ - HOST/{{ sso_principal_name }} + - {{ sso_domain_upper }} + - /etc/krb5.keytab + - false + true NORMAL @@ -263,17 +263,17 @@ MON1 - false + true false 10888 - monadmin + - 127.0.0.1|0:0:0:0:0:0:0:1 + -1 @@ -285,7 +285,7 @@ false - false + true @@ -301,7 +301,7 @@ - 1000 + -1 @@ -317,6 +317,6 @@ config/module/dictionary/ - /opt/tmp/dictionary/ + /opt/tmpadmin/dictionary/ diff --git a/roles/ams_0019_14.1.6.0_monitoring/templates/rsWebserviceImp20.xml_enable_mon.j2 b/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceImp20.xml_enable_mon.j2 similarity index 98% rename from roles/ams_0019_14.1.6.0_monitoring/templates/rsWebserviceImp20.xml_enable_mon.j2 rename to roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceImp20.xml_enable_mon.j2 index c488385..6fef2cb 100644 --- a/roles/ams_0019_14.1.6.0_monitoring/templates/rsWebserviceImp20.xml_enable_mon.j2 +++ b/roles/ams_0019_14.1.6.0_enable_monitoring/templates/rsWebserviceImp20.xml_enable_mon.j2 @@ -11,7 +11,7 @@ &key; &pwd; &common; - EICKMEBNJLFDLOGMDDLPIMCOELFGGEHGIHLJLEGDKCCMGFMDOLHPOBBECBGJKOGFAFB + DBMICLCIOOAEKOLGIPJHJEJFCPOFPNLOPILFHPBPIALGIKJHMNNLCLBBGGBCKOGFAFB /opt/tmp/ @@ -416,7 +416,7 @@ - false + true NORMAL @@ -425,17 +425,17 @@ MON1 - false + true false 10888 - monadmin + - 127.0.0.1|0:0:0:0:0:0:0:1 + -1 @@ -447,7 +447,7 @@ false - false + true @@ -463,7 +463,7 @@ - 1000 + -1 diff --git a/roles/ams_0019_14.1.6.0_monitoring/tests/inventory b/roles/ams_0019_14.1.6.0_enable_monitoring/tests/inventory similarity index 100% rename from roles/ams_0019_14.1.6.0_monitoring/tests/inventory rename to roles/ams_0019_14.1.6.0_enable_monitoring/tests/inventory diff --git a/roles/ams_0019_14.1.6.0_monitoring/tests/test.yml b/roles/ams_0019_14.1.6.0_enable_monitoring/tests/test.yml similarity index 100% rename from roles/ams_0019_14.1.6.0_monitoring/tests/test.yml rename to roles/ams_0019_14.1.6.0_enable_monitoring/tests/test.yml diff --git a/roles/ams_0019_14.1.6.0_monitoring/vars/main.yml b/roles/ams_0019_14.1.6.0_enable_monitoring/vars/main.yml similarity index 100% rename from roles/ams_0019_14.1.6.0_monitoring/vars/main.yml rename to roles/ams_0019_14.1.6.0_enable_monitoring/vars/main.yml diff --git a/roles/ams_0019_14.1.6.0_monitoring/tasks/main.yml b/roles/ams_0019_14.1.6.0_monitoring/tasks/main.yml deleted file mode 100644 index 110f1cc..0000000 --- a/roles/ams_0019_14.1.6.0_monitoring/tasks/main.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -#ams -##hiermit wird der Ursprungszustand wieder hergestellt, bevor das Monitoring aktiviert -##wurde, d.h. Monitoring ist auf aus! - #- name: Template file rsWebserviceAppserver.xml.j2 with owner and permissions - #template: - #src: rsWebserviceAppserver.xml.j2 - #dest: "{{ base_dir }}/linux/Appserver/config/rsWebserviceAppserver.xml" - #owner: jetty - #group: dba - #mode: '0644' - - #- name: Copy file rsWebserviceImp20.xml.j2 with owner and permissions - #template: - #src: rsWebserviceImp20.xml.j2 - #dest: "{{ base_dir }}/linux/Services/config/rsWebserviceImp20.xml" - #owner: jetty - #group: dba - #mode: '0644' - - - - -##hiermit wird das Monitoring eingeschaltet - - - name: Template file rsWebserviceAppserver.xml_enable_mon.j2 with owner and permissions - template: - src: rsWebserviceAppserver.xml_enable_mon.j2 - dest: "{{ base_dir }}/linux/Appserver/config/rsWebserviceAppserver.xml" - owner: jetty - group: dba - mode: '0644' - - #- name: Copy file rsWebserviceImp20.xml_enable_mon.j2 with owner and permissions - #template: - #src: rsWebserviceImp20.xml_enable_mon.j2 - #dest: "{{ base_dir }}/linux/Services/config/rsWebserviceImp20.xml" - #owner: jetty - #group: dba - #mode: '0644' - - - - - - - - - - diff --git a/roles/ams_0019_14.1.6.0_monitoring/templates/rsWebserviceImp20.xml.j2 b/roles/ams_0019_14.1.6.0_monitoring/templates/rsWebserviceImp20.xml.j2 deleted file mode 100644 index c488385..0000000 --- a/roles/ams_0019_14.1.6.0_monitoring/templates/rsWebserviceImp20.xml.j2 +++ /dev/null @@ -1,484 +0,0 @@ - - - - -]> - - - - &key; - &pwd; - &common; - EICKMEBNJLFDLOGMDDLPIMCOELFGGEHGIHLJLEGDKCCMGFMDOLHPOBBECBGJKOGFAFB - - /opt/tmp/ - - C:/Programme/Internet Explorer/IEXPLORE.EXE - - true - 1 - - - - - - - - - - - 5 - - 5 - - - - - 2 - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - {{ ams_LogLevel }} - - true - - true - true - - true - - - true - - - - - - - - - '.'yyyy-MM-dd - - - %d{dd MMM yyyy HH:mm:ss} [%t] %-5p %x :APPLICATION_ID: - %m%n - - - - 10MB - - - - - - - 0 - - rsWebserviceImp20.log - - {{ LOG_DIR }}/webservice/ - - false - - - - - - - - - - LOGIN-VERBOSE - CONNECTION - INTERFACE-COMMUNICATION - IMP-INTERFACE - XML-MAPPING - XML-OUTPUT - - - - @ENV=RS_HOME@/doc/help - - - - - /opt/tmp/rsCasePrintTemp - - - - - - /opt/tmp/rsCasePrintTemp/PrinterConfigurations - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - A|B - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - - - - - - - - - - - - - - 10 - - 30 - notepad - - - - 0 - true - - - 2880 - - - 2 - - - 3600000 - - - - - - - - - ? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - IF Import - - IF: Datenübernahme aus Fremdsystem - 120 - true - false - /opt/tmp - 60.0 - - - - 80 - - - - - - - - - - - - - - - - - 90000 - - 60000 - - true - - - - - true - - - - - - - - - C:\Users\bmeise\AppData\Local\Temp\\export - rssuper - - - - - - - - - -1 - - - - - - - - IMP2_0 - - - - - - - - true - - - false - - false - - false - - - false - true - - - - - false - - - - - - true - 2000 - - - - - - - - bka.bund.de/abs - - 1000 - - 5000 - - 3 - - - - 2880 - - - 2 - - - - - - false - - NORMAL - - - STANDARD - - MON1 - - false - - false - - 10888 - - monadmin - - - - 127.0.0.1|0:0:0:0:0:0:0:1 - - -1 - - -1 - - false - - false - - false - - false - - - - - - false - - - - - - -1 - - - - 1000 - - - - - true - - - - - true - - config/module/dictionary/ - - config/module/dictionary/ - - /opt/tmp/dictionary/ - -