From 9b031c14b630dd1f1a7346a321d2a67d3d4b5c2d Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Fri, 29 Dec 2017 03:09:04 +0100 Subject: [PATCH] Add wiki --- Vagrantfile | 3 ++- playbook.yml | 7 ++++++- production | 2 +- roles/base/tasks/main.yml | 3 +-- roles/murmur-docker/tasks/main.yml | 2 +- roles/nginx-proxy-docker/tasks/main.yml | 4 ++-- roles/searx-docker/files/searx/.env | 8 +------ .../files/searx/docker-compose.yml | 8 +++---- roles/searx-docker/tests/inventory | 2 -- roles/searx-docker/tests/test.yml | 5 ----- roles/wiki-docker/files/wiki/.env | 2 ++ .../wiki-docker/files/wiki/docker-compose.yml | 21 +++++++++++++++++++ roles/wiki-docker/meta/main.yml | 2 ++ roles/wiki-docker/tasks/main.yml | 12 +++++++++++ 14 files changed, 55 insertions(+), 26 deletions(-) delete mode 100644 roles/searx-docker/tests/inventory delete mode 100644 roles/searx-docker/tests/test.yml create mode 100644 roles/wiki-docker/files/wiki/.env create mode 100644 roles/wiki-docker/files/wiki/docker-compose.yml create mode 100644 roles/wiki-docker/meta/main.yml create mode 100644 roles/wiki-docker/tasks/main.yml diff --git a/Vagrantfile b/Vagrantfile index 18ae52f..3449e6f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -69,8 +69,9 @@ Vagrant.configure("2") do |config| # SHELL config.vm.network "private_network", ip: "192.168.33.10" config.vm.provider "virtualbox" do |vb| - vb.memory = "4096" + vb.memory = "8192" end + config.vm.synced_folder "/mnt/borg", "/mnt/borg" # config.vm.provision "ansible" do |ansible| # ansible.playbook = "playbook.yml" # end diff --git a/playbook.yml b/playbook.yml index 47768a8..7ce6ae8 100644 --- a/playbook.yml +++ b/playbook.yml @@ -9,4 +9,9 @@ - rpg roles: - role: murmur-docker - - role: searx-docker \ No newline at end of file + - role: searx-docker + - role: wiki-docker + vars_prompt: + - name: "ansible_sudo_pass" + prompt: "Sudo password" + private: yes \ No newline at end of file diff --git a/production b/production index 1ea251c..7ec0c19 100644 --- a/production +++ b/production @@ -1 +1 @@ -62.210.202.162 \ No newline at end of file +195.154.134.7 ansible_user=claude \ No newline at end of file diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index af604ee..114755e 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -10,5 +10,4 @@ - rsync - ufw - vim - - wget - - zsh \ No newline at end of file + - wget \ No newline at end of file diff --git a/roles/murmur-docker/tasks/main.yml b/roles/murmur-docker/tasks/main.yml index 0316664..132ebb1 100644 --- a/roles/murmur-docker/tasks/main.yml +++ b/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 \ No newline at end of file diff --git a/roles/nginx-proxy-docker/tasks/main.yml b/roles/nginx-proxy-docker/tasks/main.yml index f5611d0..d6bc475 100644 --- a/roles/nginx-proxy-docker/tasks/main.yml +++ b/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 diff --git a/roles/searx-docker/files/searx/.env b/roles/searx-docker/files/searx/.env index 5fc993e..c3d1c6c 100644 --- a/roles/searx-docker/files/searx/.env +++ b/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 \ No newline at end of file diff --git a/roles/searx-docker/files/searx/docker-compose.yml b/roles/searx-docker/files/searx/docker-compose.yml index f4226ff..7aa2fd7 100644 --- a/roles/searx-docker/files/searx/docker-compose.yml +++ b/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 diff --git a/roles/searx-docker/tests/inventory b/roles/searx-docker/tests/inventory deleted file mode 100644 index 878877b..0000000 --- a/roles/searx-docker/tests/inventory +++ /dev/null @@ -1,2 +0,0 @@ -localhost - diff --git a/roles/searx-docker/tests/test.yml b/roles/searx-docker/tests/test.yml deleted file mode 100644 index 00d7261..0000000 --- a/roles/searx-docker/tests/test.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- hosts: localhost - remote_user: root - roles: - - searx-docker \ No newline at end of file diff --git a/roles/wiki-docker/files/wiki/.env b/roles/wiki-docker/files/wiki/.env new file mode 100644 index 0000000..c3c51f4 --- /dev/null +++ b/roles/wiki-docker/files/wiki/.env @@ -0,0 +1,2 @@ +COMPOSE_PROJECT_NAME=wiki + diff --git a/roles/wiki-docker/files/wiki/docker-compose.yml b/roles/wiki-docker/files/wiki/docker-compose.yml new file mode 100644 index 0000000..bf67429 --- /dev/null +++ b/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 diff --git a/roles/wiki-docker/meta/main.yml b/roles/wiki-docker/meta/main.yml new file mode 100644 index 0000000..7ed8a84 --- /dev/null +++ b/roles/wiki-docker/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - nginx-proxy-docker \ No newline at end of file diff --git a/roles/wiki-docker/tasks/main.yml b/roles/wiki-docker/tasks/main.yml new file mode 100644 index 0000000..e63f665 --- /dev/null +++ b/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 \ No newline at end of file