From c474e9ca791aedd2ca339ba7e8b67dba72c9b432 Mon Sep 17 00:00:00 2001 From: Christian Elberfeld <elberfeld@web.de> Date: Wed, 1 Mar 2017 23:21:00 +0100 Subject: [PATCH] wiki auf neuen Server umgezogen --- host_vars/webserver | 1 + webserver/docker_dokuwiki/files/Dockerfile | 16 ++++++++++ webserver/docker_dokuwiki/tasks/main.yml | 36 ++++++++++++++++++++++ webserver/main.yml | 1 + webserver/nginx/includes/wiki | 12 ++++++++ 5 files changed, 66 insertions(+) create mode 100644 webserver/docker_dokuwiki/files/Dockerfile create mode 100644 webserver/docker_dokuwiki/tasks/main.yml create mode 100644 webserver/nginx/includes/wiki diff --git a/host_vars/webserver b/host_vars/webserver index 346b32f8..97248340 100644 --- a/host_vars/webserver +++ b/host_vars/webserver @@ -23,6 +23,7 @@ webserver_domains: - "ldap" - "mattermost" - "pad" + - "wiki" administratorenteam: - "void" diff --git a/webserver/docker_dokuwiki/files/Dockerfile b/webserver/docker_dokuwiki/files/Dockerfile new file mode 100644 index 00000000..74486d9c --- /dev/null +++ b/webserver/docker_dokuwiki/files/Dockerfile @@ -0,0 +1,16 @@ +FROM php:7.1-apache + +# Upload-Limits hoch setzen (Edit by Parad0x) +RUN touch /usr/local/etc/php/conf.d/uploads.ini \ + && echo "upload_max_filesize = 10M;" >> /usr/local/etc/php/conf.d/uploads.ini \ + && echo "post_max_size = 10M;" >> /usr/local/etc/php/conf.d/uploads.ini + +# Change apache settings +RUN a2enmod rewrite + +# Expose ports +EXPOSE 80 + +# startup +CMD ["apache2-foreground"] + diff --git a/webserver/docker_dokuwiki/tasks/main.yml b/webserver/docker_dokuwiki/tasks/main.yml new file mode 100644 index 00000000..81ec5cb2 --- /dev/null +++ b/webserver/docker_dokuwiki/tasks/main.yml @@ -0,0 +1,36 @@ +--- +- name: create folder struct for dokuwiki + file: + path: "/srv/dokuwiki/" + state: "directory" + +- name: create folder struct for dokuwiki + file: + path: "/tmp/dokuwiki_docker/" + state: "directory" + +- name: copy Dockerfile + copy: + src: Dockerfile + dest: /tmp/dokuwiki_docker/Dockerfile + +- name: Get a timestamp + command: "date +%Y%m%d%H%M%S" + register: timestamp + +- name: build the image + docker_image: + name: "dokuwiki-{{ timestamp.stdout }}" + path: /tmp/dokuwiki_docker/ + state: present + +- name: start dokuwiki docker + docker_container: + name: dokuwiki-app + image: "dokuwiki-{{ timestamp.stdout }}" + state: started + restart_policy: always + volumes: + - /srv/dokuwiki:/var/www/html + ports: + - 127.0.0.1:42005:80 diff --git a/webserver/main.yml b/webserver/main.yml index f6d42f9b..31130365 100644 --- a/webserver/main.yml +++ b/webserver/main.yml @@ -5,6 +5,7 @@ roles: - { role: nginx, tags: nginx } - { role: docker, tags: docker } + - { role: docker_dokuwiki, tags: dokuwiki } - { role: docker_etherpad, tags: etherpad } - { role: docker_gitlab, tags: gitlab } - { role: docker_ldap, tags: ldap } diff --git a/webserver/nginx/includes/wiki b/webserver/nginx/includes/wiki new file mode 100644 index 00000000..a4901994 --- /dev/null +++ b/webserver/nginx/includes/wiki @@ -0,0 +1,12 @@ + + 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:42005/; + proxy_redirect off; + + } -- GitLab