kofiguration für interne instanz vervollständigt

warpsrvint/docker_warpinfra/tasks/main.yml

@@ -8,6 +8,7 @@
 - name: get secrets from server 1
   slurp: src={{ item }}
   with_items:
+    - /srv/shared/noreply_email_pass
     - /srv/ldap/secret/ldap_admin_pass
     - /srv/ldap/secret/ldap_readonly_pass
     - /srv/warpinfra/secret/web_secret_key
@@ -17,6 +18,7 @@
 
 - name: get secrets from server 2
   set_fact: 
+    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', '') }}" 
     web_secret_key: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/warpinfra/secret/web_secret_key') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 

warpsrvint/docker_warpinfra/templates/config.ini

@@ -28,12 +28,11 @@ 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_ENABLED = False
 SMTP_HOST = smtp.warpzone.ms
 SMTP_PORT = 25
-SMTP_USERNAME = ''
-SMTP_PASSWORD = ''
-SMTP_EMAIL_FROM = ''
+SMTP_USERNAME = noreply@warpzone.ms
+SMTP_PASSWORD = {{ noreply_email_pass }}
+SMTP_EMAIL_FROM = infra@warpzone.ms
 SMTP_USE_TLS = True
 SUBJECT_PREFIX = ''
 

warpsrvint/docker_warpinfratest/tasks/main.yml

@@ -8,6 +8,7 @@
 - name: get secrets from server 1 
   slurp: src={{ item }}
   with_items:
+    - /srv/shared/noreply_email_pass
     - /srv/ldap/secret/ldap_admin_pass
     - /srv/ldap/secret/ldap_readonly_pass
     - /srv/warpinfratest/secret/web_secret_key
@@ -17,6 +18,7 @@
 
 - name: get secrets from server 2
   set_fact: 
+    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', '') }}" 
     web_secret_key: "{{ warpinfratest_secrets.results | selectattr('item', 'equalto', '/srv/warpinfratest/secret/web_secret_key') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 

warpsrvint/docker_warpinfratest/templates/config.ini

@@ -14,6 +14,13 @@ ALLOWED_HOSTS = infra-test.warpzone
 [mattermost]
 API_KEY = ''
 
+[mysql]
+MYSQL_HOST = mysql 
+MYSQL_PORT = 3306 
+MYSQL_USER = warpinfra
+MYSQL_PASS = {{ mysql_user_pw }}
+MYSQL_NAME = warpinfra
+
 [ldap]
 LDAP_HOST = 10.0.20.2
 LDAP_BIND_DN = cn=admin,dc=warpzone,dc=ms
@@ -28,12 +35,11 @@ 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_ENABLED = False
 SMTP_HOST = smtp.warpzone.ms
 SMTP_PORT = 25
-SMTP_USERNAME = ''
-SMTP_PASSWORD = ''
-SMTP_EMAIL_FROM = ''
+SMTP_USERNAME = noreply@warpzone.ms
+SMTP_PASSWORD = {{ noreply_email_pass }}
+SMTP_EMAIL_FROM = infra@warpzone.ms
 SMTP_USE_TLS = True
 SUBJECT_PREFIX = '[TEST] '