Merge branch 'main' into testing

This commit is contained in:
Micke Nordin 2023-09-02 09:29:06 +02:00
commit 88b3c1b4fb
Signed by untrusted user: Micke
GPG key ID: 0DA0A7A5708FE257
2 changed files with 4 additions and 0 deletions

View file

@ -5,6 +5,8 @@ services:
app: app:
image: docker.sunet.se/drive/nextcloud-custom:<%= @nextcloud_version %> image: docker.sunet.se/drive/nextcloud-custom:<%= @nextcloud_version %>
restart: always restart: always
environment:
- NC_PASS=<%= @admin_password%>
volumes: volumes:
- /opt/nextcloud/000-default.conf:/etc/apache2/sites-enabled/000-default.conf - /opt/nextcloud/000-default.conf:/etc/apache2/sites-enabled/000-default.conf
- /opt/nextcloud/mpm_prefork.conf:/etc/apache2/mods-available/mpm_prefork.conf - /opt/nextcloud/mpm_prefork.conf:/etc/apache2/mods-available/mpm_prefork.conf

View file

@ -14,6 +14,8 @@ services:
- <%= @config_php_path %>:/var/www/html/config/config.php - <%= @config_php_path %>:/var/www/html/config/config.php
- <%= @nextcloud_log_path %>:/var/www/html/data/nextcloud.log - <%= @nextcloud_log_path %>:/var/www/html/data/nextcloud.log
- <%= @rclone_conf_path %>:/rclone.conf - <%= @rclone_conf_path %>:/rclone.conf
environment:
- NC_PASS=<%= @admin_password%>
networks: networks:
- default - default
- proxysql_proxysql - proxysql_proxysql