From 80321d5ec9c7b7ee57ef7e0d19b56c82c7078544 Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Thu, 29 Aug 2019 21:51:29 +0200 Subject: [PATCH] Add Arkadia wiki --- .../wiki-docker/files/wiki/docker-compose.yml | 27 +++++++++++++++---- roles/wiki-docker/tasks/main.yml | 9 +------ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/roles/wiki-docker/files/wiki/docker-compose.yml b/roles/wiki-docker/files/wiki/docker-compose.yml index 389ae53..5ef43c8 100644 --- a/roles/wiki-docker/files/wiki/docker-compose.yml +++ b/roles/wiki-docker/files/wiki/docker-compose.yml @@ -6,17 +6,34 @@ networks: name: web services: - rpg_wiki: - image: 'bitnami/dokuwiki:0.20170219.201708232029-r7' + anderia: + image: 'bitnami/dokuwiki:0.20180422.201901061035' expose: - 80 volumes: - - '/var/lib/wiki/rpg:/bitnami' + - '/var/lib/wiki/anderia:/bitnami' - /etc/localtime:/etc/localtime:ro labels: - - "traefik.backend=rpg_wiki" + - "traefik.backend=anderia" - "traefik.docker.network=web" - - "traefik.frontend.rule=Host:rpg.banditlair.com" + - "traefik.frontend.rule=Host:anderia.banditlair.com" + - "traefik.enable=true" + - "traefik.port=80" + - "traefik.default.protocol=http" + networks: + - web + restart: always + arkadia: + image: 'bitnami/dokuwiki:0.20180422.201901061035' + expose: + - 80 + volumes: + - '/var/lib/wiki/arkadia:/bitnami' + - /etc/localtime:/etc/localtime:ro + labels: + - "traefik.backend=arkadia" + - "traefik.docker.network=web" + - "traefik.frontend.rule=Host:arkadia.banditlair.com" - "traefik.enable=true" - "traefik.port=80" - "traefik.default.protocol=http" diff --git a/roles/wiki-docker/tasks/main.yml b/roles/wiki-docker/tasks/main.yml index e63f665..666ae6f 100644 --- a/roles/wiki-docker/tasks/main.yml +++ b/roles/wiki-docker/tasks/main.yml @@ -1,12 +1,5 @@ --- - name: Copy wiki config copy: src=wiki dest={{docker_compose_files_folder}} -#- name: Create wiki data folder -# file: dest=/var/lib/wiki state=directory -#- name: Create symlink for wiki data -# file: -# src: "{{backup_folder}}/var/lib/wiki/rpg" -# dest: /var/lib/wiki/rpg -# state: link - name: Start wiki docker project - docker_service: project_src={{docker_compose_files_folder}}/wiki state=present \ No newline at end of file + docker_service: project_src={{docker_compose_files_folder}}/wiki state=present