Merge branch 'master' of ssh://gitlab.warpzone.ms:444/infrastruktur/ansible-warpzone

host_vars/webserver

@@ -40,7 +40,8 @@ webserver_domains:
   - "mattermost"
   - "pad"
   - "wiki"
-  
+  - "www-test"
+
 administratorenteam:
   - "void"
   - "dray"

webserver/docker_etherpad/templates/docker-compose.yml

 
 version: "3"
 
-services:
-
-  db:
-
-    image: mysql:5.7
-    restart: always
-    volumes:
-      - /srv/etherpad/:/var/lib/mysql
-    environment:
-      MYSQL_ROOT_PASSWORD: warpzone
-
-  app:
-
-    image: tvelocity/etherpad-lite:latest
-    restart: always
-    depends_on:
-      - db 
-    ports:
-      - 127.0.0.1:42003:42003
-    environment: 
-      ETHERPAD_TITLE: warpzone Etherpad Lite  
-      ETHERPAD_PORT: 42003
-      ETHERPAD_DB_USER: root
-      ETHERPAD_DB_PASSWORD: warpzone
-      MYSQL_PORT: tcp://db:3306
-      MYSQL_PORT_3306_TCP: tcp://db:3306
-      MYSQL_PORT_3306_TCP_ADDR: db
-      MYSQL_PORT_3306_TCP_PORT: 3306
-      MYSQL_PORT_3306_TCP_PORT: tcp
+services:                                                                                                                                                                 
+                                                                                                                                                                          
+  mysql:                                                                                                                                                            
+                                                                                                                                                                             
+    image: mysql:5.7                                                                                                                                                         
+    restart: always                                                                                      
+    volumes:                                                                                             
+      - /srv/etherpad/:/var/lib/mysql                                                                    
+    environment:                                                                                         
+      MYSQL_ROOT_PASSWORD: warpzone                                                                      
+                                      
+  app:                                                                                                   
+                                      
+    image: tvelocity/etherpad-lite:latest                                                                
+    restart: always                                                                                      
+    depends_on:                                                                                          
+      - mysql                                                                                            
+    ports:                                                                                               
+      - 127.0.0.1:42003:42003                                                                            
+    environment:                                                                                         
+      ETHERPAD_TITLE: warpzone Etherpad Lite                                                             
+      ETHERPAD_PORT: 42003                                                                               
+      ETHERPAD_DB_USER: root                                                                             
+      ETHERPAD_DB_PASSWORD: warpzone                                                                     
+      MYSQL_PORT: 3306                                                                                   
+      MYSQL_PORT_3306_TCP: tcp://mysql:3306                                                              
+      MYSQL_PORT_3306_TCP_ADDR: mysql                                                                    
+      MYSQL_PORT_3306_TCP_PORT: 3306                                                                     
+      MYSQL_PORT_3306_TCP_PORT: tcp   

webserver/docker_wordpress/tasks/main.yml

+---
+- name: get secrets from server 1
+  slurp: src={{ item }}
+  with_items:
+    - /srv/wordpress/mysql_root_pass
+    - /srv/wordpress/mysql_user_pass
+  register: wordpress_secrets
+
+- name: get secrets from server 2
+  set_fact: 
+    mysql_root_pass: "{{ wordpress_secrets.results | selectattr('item', 'equalto', '/srv/wordpress/mysql_root_pass') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
+    mysql_user_pass: "{{ wordpress_secrets.results | selectattr('item', 'equalto', '/srv/wordpress/mysql_user_pass') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
+
+- name: create folder struct for wordpress
+  file: 
+    path: "{{ item }}"
+    state: "directory"
+    owner: www-data
+    group: www-data
+  with_items:
+    - "/srv/wordpress/"
+    - "/srv/wordpress/config"
+    - "/srv/wordpress/data/"
+    - "/srv/wordpress/db/"
+
+- name: create config files
+  template: src={{ item }} dest=/srv/wordpress/config/{{ item }}
+  with_items: 
+    - uploads.ini
+
+- name: create config file
+  template: src={{ item }} dest=/srv/wordpress/{{ item }}
+  with_items: 
+    - docker-compose.yml
+
+- name: start wordpress docker
+  docker_service:
+    project_src: /srv/wordpress/
+    state: present

webserver/docker_wordpress/templates/docker-compose.yml

+
+version: "3"
+
+services:
+
+  db: 
+
+    image: mariadb:10
+    restart: always
+    volumes:
+      - /srv/wordpress/db/:/var/lib/mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: "{{ mysql_root_pass }}"
+      MYSQL_PASSWORD: "{{ mysql_user_pass }}"
+      MYSQL_DATABASE: wordpress
+      MYSQL_USER: wordpress
+
+  app:
+
+    image: wordpress:4.8.2-php7.1-apache
+    restart: always
+    volumes:
+      - /srv/wordpress/config/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini
+      - /srv/wordpress/data:/var/www/html
+    ports:
+      - 127.0.0.1:42006:80
+    environment:
+      WORDPRESS_DB_HOST: db
+      WORDPRESS_DB_USER: wordpress
+      WORDPRESS_DB_PASSWORD: "{{ mysql_user_pass }}"

webserver/docker_wordpress/templates/uploads.ini

+
+file_uploads = On
+memory_limit = 64M
+upload_max_filesize = 64M
+post_max_size = 64M
+max_execution_time = 600

webserver/main.yml

@@ -14,4 +14,5 @@
     - { role: docker_matterbridge, tags: matterbridge }
     - { role: docker_warpinfra, tags: warpinfra }
     - { role: docker_warpinfratest, tags: warpinfratest }
+    - { role: docker_wordpress, tags: wordpress }
     

webserver/nginx/includes/www-test

+
+	location /  {
+
+        	proxy_set_header        Host $host;
+        	proxy_set_header        X-Real-IP $remote_addr;
+	        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        	proxy_set_header        X-Forwarded-Proto $scheme;
+
+	        proxy_pass      http://127.0.0.1:42006/;
+        	proxy_redirect  off;
+
+    }

webserver/nginx/tasks/main.yml

@@ -70,7 +70,8 @@
 
 - name: Konfig-Datei default erstellen
   template: src=nginx-site dest=/etc/nginx/sites-enabled/{{ item }}.wapzone.ms
-  with_items: webserver_domains
+  with_items: 
+    - "{{webserver_domains}}"
   notify: restart nginx