Add wiki

roles/base/tasks/main.yml

@@ -10,5 +10,4 @@
     - rsync
     - ufw
     - vim
-    - wget
-    - zsh
+    - wget

roles/murmur-docker/tasks/main.yml

@@ -4,6 +4,6 @@
 - name: Create murmur data folder
   file: dest={{docker_compose_persistence_folder}}/murmur state=directory
 - name: Copy murmur database
-  copy: src={{backup_folder}}/backups/murmur/murmur.sqlite dest=/var/lib/murmur/
+  copy: src=/backups/murmur/murmur.sqlite dest=/var/lib/murmur/ force=no remote_src=yes
 - name: Start murmur docker project
   docker_service: project_src={{docker_compose_files_folder}}/murmur state=present

roles/nginx-proxy-docker/tasks/main.yml

@@ -1,8 +1,8 @@
 ---
 - name: Copy proxy config
   copy: src=proxy dest={{docker_compose_files_folder}}
-- name: Copy certificates
-  copy: src={{backup_folder}}/{{docker_compose_files_folder}}/proxy/nginx/certs dest={{docker_compose_files_folder}}/proxy/nginx
+#- name: Copy certificates
+#  copy: src={{backup_folder}}/{{docker_compose_files_folder}}/proxy/nginx/certs dest={{docker_compose_files_folder}}/proxy/nginx
 - name: Create nginx-proxy docker network
   docker_network:
     name: nginx-proxy

roles/searx-docker/files/searx/.env

@@ -1,7 +1 @@
-COMPOSE_PROJECT_NAME=searx
-
-#Domains
-DOMAIN=banditlair.com
-
-#Letsencrypt
-LETSENCRYPT_EMAIL=letsencrypt.account@banditlair.com
+COMPOSE_PROJECT_NAME=searx

roles/searx-docker/files/searx/docker-compose.yml

@@ -9,13 +9,13 @@ services:
   searx:
     image: wonderfall/searx
     environment:
-      - BASE_URL="https://${DOMAIN}"
+      - BASE_URL="https://banditlair.com"
       - IMAGE_PROXY=True
-      - VIRTUAL_HOST=${DOMAIN}
+      - VIRTUAL_HOST=banditlair.com
       - VIRTUAL_NETWORK=nginx-proxy
       - VIRTUAL_PORT=8888
-      - LETSENCRYPT_HOST=${DOMAIN},mail.banditlair.com,gitlab.banditlair.com,grafana.banditlair.com,cloud.banditlair.com,office.banditlair.com,plex.banditlair.com,sonar.banditlair.com,deluge.banditlair.com,rpg.banditlair.com,matrix.banditlair.com,emby.banditlair.com
-      - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
+      - LETSENCRYPT_HOST=banditlair.com,mail.banditlair.com,gitlab.banditlair.com,grafana.banditlair.com,cloud.banditlair.com,office.banditlair.com,plex.banditlair.com,sonar.banditlair.com,deluge.banditlair.com,rpg.banditlair.com,matrix.banditlair.com,emby.banditlair.com
+      - LETSENCRYPT_EMAIL=letsencrypt.account@banditlair.com
     networks:
       - proxy-tier
     restart: always

roles/searx-docker/tests/inventory

@@ -1,2 +0,0 @@
-localhost
-

roles/searx-docker/tests/test.yml

@@ -1,5 +0,0 @@
----
-- hosts: localhost
-  remote_user: root
-  roles:
-    - searx-docker

roles/wiki-docker/files/wiki/.env

@@ -0,0 +1,2 @@
+COMPOSE_PROJECT_NAME=wiki
+

roles/wiki-docker/files/wiki/docker-compose.yml

@@ -0,0 +1,21 @@
+version: '2.2'
+
+networks:
+  proxy-tier:
+    external:
+      name: nginx-proxy
+
+services:
+  rpg_wiki:
+    image: 'bitnami/dokuwiki:latest'
+    expose:
+      - 80
+    environment:
+      - VIRTUAL_HOST=rpg.banditlair.com
+      - VIRTUAL_NETWORK=nginx-proxy
+      - VIRTUAL_PORT=80
+    volumes:
+      - '/var/lib/wiki/rpg:/bitnami'
+    networks:
+      - proxy-tier
+    restart: always

roles/wiki-docker/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+  - nginx-proxy-docker

roles/wiki-docker/tasks/main.yml

@@ -0,0 +1,12 @@
+---
+- 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