diff --git a/playbook.yml b/playbook.yml index 6c20424..d11401c 100644 --- a/playbook.yml +++ b/playbook.yml @@ -24,9 +24,4 @@ - { role: monit, tags: [ 'monit' ] } - { role: arch-mirror-docker, tags: [ 'mirror', 'docker' ] } - { role: traefik-proxy-docker, tags: [ 'traefik', 'docker' ] } -# vars_prompt: -# - name: "ansible_sudo_pass" -# prompt: "Sudo password" -# private: yes - vars_files: - - "passwords.yml" + diff --git a/production b/production index 7ec0c19..1e975c9 100644 --- a/production +++ b/production @@ -1 +1 @@ -195.154.134.7 ansible_user=claude \ No newline at end of file +195.154.134.7 ansible_user=claude diff --git a/roles/nextcloud-docker/files/nextcloud/app/Dockerfile b/roles/nextcloud-docker/files/nextcloud/app/Dockerfile index 2bebe3d..fb82174 100644 --- a/roles/nextcloud-docker/files/nextcloud/app/Dockerfile +++ b/roles/nextcloud-docker/files/nextcloud/app/Dockerfile @@ -1,4 +1,4 @@ -FROM nextcloud:13.0.2-fpm +FROM nextcloud:13.0.5-fpm RUN apt-get update && apt-get install -y \ supervisor \ diff --git a/roles/nextcloud-docker/files/nextcloud/docker-compose.yml b/roles/nextcloud-docker/files/nextcloud/docker-compose.yml index 099c2d6..7e0d940 100644 --- a/roles/nextcloud-docker/files/nextcloud/docker-compose.yml +++ b/roles/nextcloud-docker/files/nextcloud/docker-compose.yml @@ -62,26 +62,26 @@ services: image: redis restart: always - onlyoffice: - image: onlyoffice/documentserver:latest - stdin_open: true - tty: true - expose: - - '80' - labels: - - "traefik.backend=onlyoffice" - - "traefik.docker.network=web" - - "traefik.frontend.rule=Host:office.banditlair.com" - - "traefik.enable=true" - - "traefik.port=80" - - "traefik.default.protocol=http" - volumes: - - /var/lib/onlyoffice:/var/www/onlyoffice/Data - - /var/log/onlyoffice:/var/log/onlyoffice - networks: - - web - - default - restart: always +# onlyoffice: +# image: onlyoffice/documentserver:latest +# stdin_open: true +# tty: true +# expose: +# - '80' +# labels: +# - "traefik.backend=onlyoffice" +# - "traefik.docker.network=web" +# - "traefik.frontend.rule=Host:office.banditlair.com" +# - "traefik.enable=true" +# - "traefik.port=80" +# - "traefik.default.protocol=http" +# volumes: +# - /var/lib/onlyoffice:/var/www/onlyoffice/Data +# - /var/log/onlyoffice:/var/log/onlyoffice +# networks: +# - web +# - default +# restart: always # collabora: # image: collabora/code:3.0.0.4 diff --git a/roles/nextcloud-docker/tasks/main.yml b/roles/nextcloud-docker/tasks/main.yml index 4f0762c..8e52ab2 100644 --- a/roles/nextcloud-docker/tasks/main.yml +++ b/roles/nextcloud-docker/tasks/main.yml @@ -9,8 +9,12 @@ dest: "{{docker_compose_files_folder}}/nextcloud/db.env" - name: Create nextcloud config template: - src: nextcloud/config/config.php - dest: "{{docker_compose_files_folder}}/nextcloud/config/config.php" + src: nextcloud/config/{{item}} + dest: "{{docker_compose_files_folder}}/nextcloud/config/{{item}}" + with_items: + - base.config.php + - database.config.php + - mail.config.php - name: Change config folder owner to http file: path: "{{docker_compose_files_folder}}/nextcloud/config" diff --git a/roles/nextcloud-docker/templates/nextcloud/config/base.config.php b/roles/nextcloud-docker/templates/nextcloud/config/base.config.php new file mode 100644 index 0000000..2549edb --- /dev/null +++ b/roles/nextcloud-docker/templates/nextcloud/config/base.config.php @@ -0,0 +1,20 @@ + 'ocbsz7gnyjst', + 'passwordsalt' => '{{nextcloud_passwordsalt}}', + 'secret' => '{{nextcloud_secret}}', + 'trusted_domains' => + array ( + 0 => 'localhost', + 1 => 'web', + 2 => 'cloud.banditlair.com', + ), + 'datadirectory' => '/var/www/html/data', + 'overwrite.cli.url' => 'https://cloud.banditlair.com', + 'htaccess.RewriteBase' => '/', + 'maintenance' => false, + 'updater.release.channel' => 'stable', + 'loglevel' => '1', + 'filelocking.enabled' => true, + 'theme' => '', +); diff --git a/roles/nextcloud-docker/templates/nextcloud/config/config.php b/roles/nextcloud-docker/templates/nextcloud/config/config.php deleted file mode 100644 index 0489bc5..0000000 --- a/roles/nextcloud-docker/templates/nextcloud/config/config.php +++ /dev/null @@ -1,61 +0,0 @@ - 'ocbsz7gnyjst', - 'passwordsalt' => '{{nextcloud_passwordsalt}}', - 'secret' => '{{nextcloud_secret}}', - 'trusted_domains' => - array ( - 0 => 'localhost', - 1 => 'web', - 2 => 'cloud.banditlair.com', - ), - 'datadirectory' => '/var/www/html/data', - 'overwrite.cli.url' => 'https://cloud.banditlair.com', - 'dbtype' => 'mysql', - 'version' => '13.0.2.1', - 'dbname' => 'nextcloud', - 'dbhost' => 'db', - 'dbport' => '3306', - 'dbtableprefix' => 'oc_', - 'dbuser' => 'nextcloud', - 'dbpassword' => '{{nextcloud_mysql_password}}', - 'installed' => true, - 'htaccess.RewriteBase' => '/', - 'maintenance' => false, - 'updater.release.channel' => 'stable', - 'loglevel' => '1', - 'mail_smtpmode' => 'smtp', - 'mail_smtpauthtype' => 'PLAIN', - 'mail_smtpsecure' => 'ssl', - 'mail_smtpauth' => 1, - 'mail_from_address' => 'noreply', - 'mail_domain' => 'banditlair.com', - 'mail_smtphost' => 'mail.banditlair.com', - 'mail_smtpport' => '465', - '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/nextcloud-docker/templates/nextcloud/config/database.config.php b/roles/nextcloud-docker/templates/nextcloud/config/database.config.php new file mode 100644 index 0000000..89d8e7b --- /dev/null +++ b/roles/nextcloud-docker/templates/nextcloud/config/database.config.php @@ -0,0 +1,10 @@ + 'mysql', + 'dbname' => 'nextcloud', + 'dbhost' => 'db', + 'dbport' => '3306', + 'dbtableprefix' => 'oc_', + 'dbuser' => 'nextcloud', + 'dbpassword' => '{{nextcloud_mysql_password}}', +); diff --git a/roles/nextcloud-docker/templates/nextcloud/config/mail.config.php b/roles/nextcloud-docker/templates/nextcloud/config/mail.config.php new file mode 100644 index 0000000..d288f82 --- /dev/null +++ b/roles/nextcloud-docker/templates/nextcloud/config/mail.config.php @@ -0,0 +1,13 @@ + 'smtp', + 'mail_smtpauthtype' => 'PLAIN', + 'mail_smtpsecure' => 'ssl', + 'mail_smtpauth' => 1, + 'mail_from_address' => 'noreply', + 'mail_domain' => 'banditlair.com', + 'mail_smtphost' => 'mail.banditlair.com', + 'mail_smtpport' => '465', + 'mail_smtpname' => 'noreply@banditlair.com', + 'mail_smtppassword' => '{{email_password}}', +);