Skip to content
Snippets Groups Projects
Commit 22accaa0 authored by void's avatar void
Browse files

Korrekturen deployment für interne Produktivinstanz

parent ad44587f
No related branches found
No related tags found
No related merge requests found
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
- name: clone repo - name: clone repo
git: git:
repo: "https://gitlab.warpzone.ms/infrastruktur/warpinfra.git" repo: "https://gitlab.warpzone.ms/infrastruktur/warpinfra.git"
version: "1.1" # version: "1.1"
dest: "/tmp/warpinfra_docker" dest: "/tmp/warpinfra_docker"
force: "yes" force: "yes"
register: gitclone register: gitclone
......
...@@ -18,6 +18,13 @@ ALLOWED_HOSTS = infra.warpzone ...@@ -18,6 +18,13 @@ ALLOWED_HOSTS = infra.warpzone
[mattermost] [mattermost]
API_KEY = '' API_KEY = ''
[mysql]
MYSQL_HOST = mysql
MYSQL_PORT = 3306
MYSQL_USER = warpinfra
MYSQL_PASS = {{ mysql_user_pw }}
MYSQL_NAME = warpinfra
[ldap] [ldap]
LDAP_HOST = 10.0.20.2 LDAP_HOST = 10.0.20.2
LDAP_BIND_DN = cn=admin,dc=warpzone,dc=ms LDAP_BIND_DN = cn=admin,dc=warpzone,dc=ms
......
...@@ -12,6 +12,8 @@ server { ...@@ -12,6 +12,8 @@ server {
listen 443 ssl spdy; listen 443 ssl spdy;
listen [::]:443 ssl spdy; listen [::]:443 ssl spdy;
server_name {{ item }}.warpzone;
ssl_certificate /etc/ssl/server.{{ item }}.crt; ssl_certificate /etc/ssl/server.{{ item }}.crt;
ssl_certificate_key /etc/ssl/server.{{ item }}.key; ssl_certificate_key /etc/ssl/server.{{ item }}.key;
ssl_session_cache shared:SSL:5m; ssl_session_cache shared:SSL:5m;
...@@ -22,7 +24,6 @@ server { ...@@ -22,7 +24,6 @@ server {
ssl_prefer_server_ciphers on; ssl_prefer_server_ciphers on;
server_name {{ item }}.warpzone.ms;
root /dev/null; root /dev/null;
index index.html; index index.html;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment