diff --git a/playbook.yml b/playbook.yml index 2ebfbfc..5aeb772 100644 --- a/playbook.yml +++ b/playbook.yml @@ -21,6 +21,7 @@ - { role: plex-docker, tags: [ 'plex', 'docker' ] } - { role: deluge-docker, tags: [ 'deluge', 'docker' ] } - { role: monit, tags: [ 'monit' ] } + - { role: arch-mirror-docker, tags: [ 'mirror', 'docker' ] } # vars_prompt: # - name: "ansible_sudo_pass" # prompt: "Sudo password" diff --git a/roles/arch-mirror-docker/files/arch-mirror/.env b/roles/arch-mirror-docker/files/arch-mirror/.env new file mode 100644 index 0000000..c025874 --- /dev/null +++ b/roles/arch-mirror-docker/files/arch-mirror/.env @@ -0,0 +1,2 @@ +COMPOSE_PROJECT_NAME=arch-mirror + diff --git a/roles/arch-mirror-docker/files/arch-mirror/docker-compose.yml b/roles/arch-mirror-docker/files/arch-mirror/docker-compose.yml new file mode 100644 index 0000000..78462a4 --- /dev/null +++ b/roles/arch-mirror-docker/files/arch-mirror/docker-compose.yml @@ -0,0 +1,21 @@ +version: '2.2' + +networks: + proxy-tier: + external: + name: nginx-proxy + +services: + arch-mirror: + image: nginx:latest + expose: + - 80 + environment: + - VIRTUAL_HOST=arch.banditlair.com + - VIRTUAL_NETWORK=nginx-proxy + - VIRTUAL_PORT=80 + volumes: + - /srv/repo:/usr/share/nginx/html:ro + networks: + - proxy-tier + restart: always diff --git a/roles/arch-mirror-docker/meta/main.yml b/roles/arch-mirror-docker/meta/main.yml new file mode 100644 index 0000000..d5ef1dd --- /dev/null +++ b/roles/arch-mirror-docker/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - nginx-proxy-docker diff --git a/roles/arch-mirror-docker/tasks/main.yml b/roles/arch-mirror-docker/tasks/main.yml new file mode 100644 index 0000000..f795a4a --- /dev/null +++ b/roles/arch-mirror-docker/tasks/main.yml @@ -0,0 +1,5 @@ +--- +- name: Copy Arch Linux mirror config + copy: src=arch-mirror dest={{docker_compose_files_folder}} +- name: Start Arch mirror project + docker_service: project_src={{docker_compose_files_folder}}/arch-mirror state=present diff --git a/roles/nextcloud-docker/templates/nextcloud/config/config.php b/roles/nextcloud-docker/templates/nextcloud/config/config.php index 4edc57f..6c34dd5 100644 --- a/roles/nextcloud-docker/templates/nextcloud/config/config.php +++ b/roles/nextcloud-docker/templates/nextcloud/config/config.php @@ -11,7 +11,7 @@ $CONFIG = array ( 'datadirectory' => '/var/www/html/data', 'overwrite.cli.url' => 'https://cloud.banditlair.com', 'dbtype' => 'mysql', - 'version' => '12.0.4.3', + 'version' => '13.0.0.14', 'dbname' => 'nextcloud', 'dbhost' => 'db', 'dbport' => '3306', @@ -24,7 +24,7 @@ $CONFIG = array ( 'updater.release.channel' => 'stable', 'loglevel' => '1', 'mail_smtpmode' => 'smtp', - 'mail_smtpauthtype' => 'LOGIN', + 'mail_smtpauthtype' => 'PLAIN', 'mail_smtpsecure' => 'ssl', 'mail_smtpauth' => 1, 'mail_from_address' => 'noreply', @@ -34,4 +34,27 @@ $CONFIG = array ( 'mail_smtpname' => 'noreply@banditlair.com', 'mail_smtppassword' => '{{email_password}}', 'filelocking.enabled' => true, + 'memcache.local' => '\\OC\\Memcache\\Redis', + 'apps_paths' => + array ( + 0 => + array ( + 'path' => '/var/www/html/apps', + 'url' => '/apps', + 'writable' => false, + ), + 1 => + array ( + 'path' => '/var/www/html/custom_apps', + 'url' => '/custom_apps', + 'writable' => true, + ), + ), + 'memcache.locking' => '\\OC\\Memcache\\Redis', + 'redis' => + array ( + 'host' => 'redis', + 'port' => 6379, + ), + 'theme' => '', ); diff --git a/roles/searx-docker/files/searx/docker-compose.yml b/roles/searx-docker/files/searx/docker-compose.yml index 788b2d6..ea01d2f 100644 --- a/roles/searx-docker/files/searx/docker-compose.yml +++ b/roles/searx-docker/files/searx/docker-compose.yml @@ -14,7 +14,7 @@ services: - VIRTUAL_HOST=banditlair.com - VIRTUAL_NETWORK=nginx-proxy - VIRTUAL_PORT=8888 - - LETSENCRYPT_HOST=banditlair.com,mail.banditlair.com,mailu.banditlair.com,webmail.banditlair.com,gitlab.banditlair.com,cloud.banditlair.com,office.banditlair.com,plex.banditlair.com,deluge.banditlair.com,rpg.banditlair.com,matrix.banditlair.com,emby.banditlair.com + - LETSENCRYPT_HOST=banditlair.com,mail.banditlair.com,mailu.banditlair.com,webmail.banditlair.com,gitlab.banditlair.com,cloud.banditlair.com,plex.banditlair.com,deluge.banditlair.com,rpg.banditlair.com,matrix.banditlair.com,emby.banditlair.com,arch.banditlair.com - LETSENCRYPT_EMAIL=letsencrypt.account@banditlair.com networks: - proxy-tier