diff --git a/forgejo/docker-compose.yml b/forgejo/docker-compose.yml index 3920105..1c18599 100644 --- a/forgejo/docker-compose.yml +++ b/forgejo/docker-compose.yml @@ -34,10 +34,6 @@ services: ' environment: FORGEJO__security__INSTALL_LOCK: "true" - FORGEJO__server__DISABLE_SSH: "true" - FORGEJO__service__DISABLE_REGISTRATION: "true" - FORGEJO__service__SHOW_REGISTRATION_BUTTON: "false" - FORGEJO__service__DEFAULT_KEEP_EMAIL_PRIVATE: "true" FORGEJO__log__LEVEL: "debug" FORGEJO__repository__ENABLE_PUSH_CREATE_USER: "true" FORGEJO__repository__DEFAULT_PUSH_CREATE_PRIVATE: "false" @@ -45,7 +41,7 @@ services: volumes: - ./volumes/forgejo-data:/data ports: - - "127.0.0.1:3001:3000" + - "127.0.0.1:13000:3000" runner-daemon: image: code.forgejo.org/forgejo/runner:3.3.0 diff --git a/nextcloud/README.md b/nextcloud/README.md index 1fe6c0f..8feef39 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -1,9 +1,5 @@ # Nextcloud Docker Compose Stack -- [Nextcloud Docker Compose Stack](#nextcloud-docker-compose-stack) - - [Directory structure](#directory-structure) - - [Configuration](#configuration) - ## Directory structure ``` /opt/docker/nextcloud @@ -14,7 +10,4 @@ └── volumes ├── db └── nextcloud -``` - -## Configuration -Change the values in **mariadb.env** and **nextcloud.env** accordingly. \ No newline at end of file +``` \ No newline at end of file diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 7e65edf..1a5a52b 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -1,10 +1,11 @@ --- services: nc_db: - image: mariadb:10.11 + image: mariadb:10.5 container_name: nc_db command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW environment: + - MYSQL_ROOT_PASSWORD=Subatomic-Lapping0-Untagged-Deceptive-Judge - MARIADB_AUTO_UPGRADE=1 - MARIADB_DISABLE_UPGRADE_BACKUP=1 env_file: @@ -25,6 +26,11 @@ services: environment: - MYSQL_HOST=nc_db - REDIS_HOST=nc_redis + - TRUSTED_PROXIES=172.16.0.0/12 + - OVERWRITEHOST=cloud.smail.koeln + - OVERWRITEPROTOCOL=https + - OVERWRITEWEBROOT=/ + - PHP_UPLOAD_LIMIT=1G env_file: - nextcloud.env ports: diff --git a/nextcloud/mariadb.env b/nextcloud/mariadb.env index abcd135..2b1b863 100644 --- a/nextcloud/mariadb.env +++ b/nextcloud/mariadb.env @@ -1 +1 @@ -MYSQL_ROOT_PASSWORD=YOUR_RANDOM_PASSWORD \ No newline at end of file +MYSQL_ROOT_PASSWORD= \ No newline at end of file diff --git a/nextcloud/nextcloud.env b/nextcloud/nextcloud.env index 8898d10..1aebc54 100644 --- a/nextcloud/nextcloud.env +++ b/nextcloud/nextcloud.env @@ -1,25 +1,3 @@ -# https://github.com/nextcloud/docker#base-version---apache - -# Nextcloud database settings -MYSQL_DATABASE=nextcloud -MYSQL_USER=nextcloud -MYSQL_PASSWORD=YOUR_RANDOM_PASSWORD - -# Reverse proxy settings -# If you're not using a reverse proxy (not recommended), you must comment out the following lines -TRUSTED_PROXIES=172.16.0.0/12 -OVERWRITEHOST=cloud.example.com -OVERWRITEPROTOCOL=https -OVERWRITEWEBROOT=/ - -# PHP settings -PHP_UPLOAD_LIMIT=1G - -# SMTP settings -SMTP_HOST=smtp.example.com -SMTP_PORT=465 -SMTP_SECURE=ssl -SMTP_NAME=no-reply@example.com -SMTP_PASSWORD=YOUR_SECURE_PASSWORD -MAIL_FROM_ADDRESS=no-reply -MAIL_DOMAIN=example.com \ No newline at end of file +MYSQL_PASSWORD= +MYSQL_DATABASE= +MYSQL_USER= \ No newline at end of file