weitere einstellungen für mattermost benachrichtigungen

webserver/docker_warpinfra/tasks/main.yml

@@ -11,6 +11,7 @@
     - /srv/shared/noreply_email_pass
     - /srv/ldap/secret/ldap_admin_pass
     - /srv/ldap/secret/ldap_readonly_pass
+    - /srv/warpinfra/secret/mattermost_api_key
     - /srv/warpinfra/secret/web_secret_key
   register: warpinfra_secrets
 
@@ -19,6 +20,7 @@
     noreply_email_pass: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/shared/noreply_email_pass') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
     ldap_admin_pass: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/ldap/secret/ldap_admin_pass') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
     ldap_readonly_pass: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/ldap/secret/ldap_readonly_pass') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
+    mattermost_api_key: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/warpinfra/secret/mattermost_api_key') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
     web_secret_key: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/warpinfra/secret/web_secret_key') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
 
 - name: create folder struct for warpinfra 
@@ -36,6 +38,11 @@
     path: "/srv/warpinfra/data" 
     state: "directory"
 
+- name: create folder struct for warpinfra 
+  file: 
+    path: "/srv/warpinfra/log" 
+    state: "directory"
+
 - name: Konfig-Datei erstellen
   template: 
     src: "config.ini" 
@@ -73,6 +80,7 @@
       - /tmp/warpinfra:/opt/socket
       - /srv/warpinfra/etc:/etc/warpinfra
       - /srv/warpinfra/data:/opt/database
+      - /srv/warpinfratest/log:/opt/log
     links: 
       - ldap-service:ldap
 

webserver/docker_warpinfra/templates/config.ini

@@ -7,6 +7,9 @@ SECRET_KEY = '{{ web_secret_key }}'
 PW_RESET_TOKEN_LIFETIME = 5
 ALLOWED_HOSTS = infra.warpzone.ms
 
+[mattermost]
+API_KEY = {{mattermost_api_key}}
+
 [ldap]
 LDAP_HOST = ldap
 LDAP_BIND_DN = cn=admin,dc=warpzone,dc=ms
@@ -20,7 +23,6 @@ LDAP_GROUP_IS_ACTIVE = cn=active,ou=groups,dc=warpzone,dc=ms
 LDAP_GROUP_IS_STAFF = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
 LDAP_GROUP_SUPERUSER = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
 
-
 [email]
 SMTP_HOST = smtp.warpzone.ms
 SMTP_PORT = 25
@@ -30,6 +32,5 @@ SMTP_EMAIL_FROM = infra@warpzone.ms
 SMTP_USE_TLS = True
 SUBJECT_PREFIX = ''
 
-
 [misc]
-LOG_PATH = /var/log/
+LOG_PATH = /opt/log/

webserver/docker_warpinfratest/tasks/main.yml

@@ -11,6 +11,7 @@
     - /srv/shared/noreply_email_pass
     - /srv/ldap/secret/ldap_admin_pass
     - /srv/ldap/secret/ldap_readonly_pass
+    - /srv/warpinfratest/secret/mattermost_api_key
     - /srv/warpinfratest/secret/web_secret_key
   register: warpinfratest_secrets
 
@@ -19,6 +20,7 @@
     noreply_email_pass: "{{ warpinfratest_secrets.results | selectattr('item', 'equalto', '/srv/shared/noreply_email_pass') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
     ldap_admin_pass: "{{ warpinfratest_secrets.results | selectattr('item', 'equalto', '/srv/ldap/secret/ldap_admin_pass') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
     ldap_readonly_pass: "{{ warpinfratest_secrets.results | selectattr('item', 'equalto', '/srv/ldap/secret/ldap_readonly_pass') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
+    mattermost_api_key: "{{ warpinfratest_secrets.results | selectattr('item', 'equalto', '/srv/warpinfratest/secret/mattermost_api_key') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
     web_secret_key: "{{ warpinfratest_secrets.results | selectattr('item', 'equalto', '/srv/warpinfratest/secret/web_secret_key') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
 
 - name: create folder struct for warpinfratest
@@ -36,6 +38,11 @@
     path: "/srv/warpinfratest/data" 
     state: "directory"
 
+- name: create folder struct for warpinfratest 
+  file: 
+    path: "/srv/warpinfratest/log" 
+    state: "directory"
+
 - name: Konfig-Datei erstellen
   template: 
     src: "config.ini" 
@@ -72,6 +79,7 @@
       - /tmp/warpinfratest:/opt/socket
       - /srv/warpinfratest/etc:/etc/warpinfra
       - /srv/warpinfratest/data:/opt/database
+      - /srv/warpinfratest/log:/opt/log
     links: 
       - ldap-service:ldap
 

webserver/docker_warpinfratest/templates/config.ini

@@ -7,6 +7,9 @@ SECRET_KEY = '{{ web_secret_key }}'
 PW_RESET_TOKEN_LIFETIME = 5
 ALLOWED_HOSTS = infra.warpzone.ms
 
+[mattermost]
+API_KEY = {{mattermost_api_key}}
+
 [ldap]
 LDAP_HOST = ldap
 LDAP_BIND_DN = cn=admin,dc=warpzone,dc=ms
@@ -20,16 +23,14 @@ LDAP_GROUP_IS_ACTIVE = cn=active,ou=groups,dc=warpzone,dc=ms
 LDAP_GROUP_IS_STAFF = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
 LDAP_GROUP_SUPERUSER = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
 
-
 [email]
 SMTP_HOST = smtp.warpzone.ms
 SMTP_PORT = 25
 SMTP_USERNAME = noreply@warpzone.ms
 SMTP_PASSWORD = {{ noreply_email_pass }}
-SMTP_EMAIL_FROM = test-infra-test@warpzone.ms
+SMTP_EMAIL_FROM = infra@warpzone.ms
 SMTP_USE_TLS = True
-SUBJECT_PREFIX = ''
-
+SUBJECT_PREFIX = '[TEST] '
 
 [misc]
-LOG_PATH = /var/log/
+LOG_PATH = /opt/log/