From d3137daec391f86aac2a20d5655327e4141e1e22 Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <christian.elberfeld@adesso.de>
Date: Sat, 18 Jan 2020 01:25:49 +0100
Subject: [PATCH] Dokuwiki Upgrade und reorg

---
 webserver/docker_dokuwiki/tasks/main.yml      | 19 +++++++------------
 .../{files => templates}/Dockerfile           | 15 +++++++++++++--
 .../templates/docker-compose.yml              |  5 +++--
 .../templates/sendmail_plenum.py              |  2 +-
 4 files changed, 24 insertions(+), 17 deletions(-)
 rename webserver/docker_dokuwiki/{files => templates}/Dockerfile (55%)

diff --git a/webserver/docker_dokuwiki/tasks/main.yml b/webserver/docker_dokuwiki/tasks/main.yml
index 4418c93c..25c8f7af 100644
--- a/webserver/docker_dokuwiki/tasks/main.yml
+++ b/webserver/docker_dokuwiki/tasks/main.yml
@@ -6,18 +6,12 @@
 
 - name: create folder struct for dokuwiki
   file:
-    path: "/srv/dokuwiki/"
+    path: "{{item}}"
     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
+  with_items:
+    - /srv/dokuwiki/
+    - /srv/dokuwiki/data
+    - /srv/dokuwiki/pdftemplate
 
 - name: Docker Compose Konfig-Datei erstellen
   template:
@@ -25,10 +19,11 @@
     dest: "/srv/dokuwiki/{{item}}"
   with_items:
     - docker-compose.yml
+    - Dockerfile
     - sendmail_plenum.py
 
 - name: start dokuwiki docker
-  docker_service:
+  docker_compose:
     project_src: /srv/dokuwiki/
     state: present
 
diff --git a/webserver/docker_dokuwiki/files/Dockerfile b/webserver/docker_dokuwiki/templates/Dockerfile
similarity index 55%
rename from webserver/docker_dokuwiki/files/Dockerfile
rename to webserver/docker_dokuwiki/templates/Dockerfile
index 74486d9c..1ac41375 100644
--- a/webserver/docker_dokuwiki/files/Dockerfile
+++ b/webserver/docker_dokuwiki/templates/Dockerfile
@@ -1,4 +1,13 @@
-FROM php:7.1-apache
+FROM php:7.4-apache
+
+# php-gd modul für dw2pdf plugin
+RUN apt-get update && apt-get install -y \
+        libfreetype6-dev \
+        libjpeg62-turbo-dev \
+        libpng-dev \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg \
+    && docker-php-ext-install -j$(nproc) gd
+
 
 # Upload-Limits hoch setzen (Edit by Parad0x)
 RUN touch /usr/local/etc/php/conf.d/uploads.ini \
@@ -7,10 +16,12 @@ RUN touch /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/templates/docker-compose.yml b/webserver/docker_dokuwiki/templates/docker-compose.yml
index 918539df..2712a77f 100644
--- a/webserver/docker_dokuwiki/templates/docker-compose.yml
+++ b/webserver/docker_dokuwiki/templates/docker-compose.yml
@@ -4,10 +4,11 @@ services:
 
   app:
 
-    build: /tmp/dokuwiki_docker/
+    build: .
     image: "dokuwiki--{{ ansible_date_time.date }}--{{ ansible_date_time.hour }}-{{ ansible_date_time.minute }}-{{ ansible_date_time.second }}"
     restart: always
     ports:
       - 127.0.0.1:42005:80
     volumes:
-      - /srv/dokuwiki:/var/www/html
+      - /srv/dokuwiki/data/:/var/www/html
+      - /srv/dokuwiki/pdftemplate/:/var/www/html/lib/plugins/dw2pdf/tpl/warpzone/
diff --git a/webserver/docker_dokuwiki/templates/sendmail_plenum.py b/webserver/docker_dokuwiki/templates/sendmail_plenum.py
index 47749f67..4663f606 100644
--- a/webserver/docker_dokuwiki/templates/sendmail_plenum.py
+++ b/webserver/docker_dokuwiki/templates/sendmail_plenum.py
@@ -6,7 +6,7 @@ msg['Subject'] = 'Aktuelle Plenumsthemen für den kommenden Dienstag 20:00'
 msg['From'] = '{{noreply_email_user}}'
 msg['To'] = 'intern@warpzone.ms'
 
-with open("/srv/dokuwiki/data/pages/intern/diskussionsthemen.txt") as fp:
+with open("/srv/dokuwiki/data/data/pages/intern/diskussionsthemen.txt") as fp:
     msg.set_content(fp.read())
 
 server = smtplib.SMTP('{{smtp_host}}', {{smtp_port}})
-- 
GitLab