diff --git a/cloud/.env.example b/cloud/.env.example deleted file mode 100644 index acadd16..0000000 --- a/cloud/.env.example +++ /dev/null @@ -1,13 +0,0 @@ -NEXTCLOUD_DATABASE=nextcloud-db -DATABASE_USER=nextcloud -DATABASE_PASSWORD=password -DATABASE_ROOT_PASSWORD=another_password -PATH_TO_FOLDER=/path/to/folder/ - -NEXTCLOUD_ADMIN=admin -NEXTCLOUD_PASSWORD=password -NEXTCLOUD_DOMAIN=cloud.domain.ru - -COLLABORA_ADMIN=admin -COLLABORA_PASSWORD=password -COLLABORA_DOMAIN=office.domain.ru diff --git a/cloud/docker-compose.yml b/cloud/docker-compose.yml deleted file mode 100644 index a7809f0..0000000 --- a/cloud/docker-compose.yml +++ /dev/null @@ -1,71 +0,0 @@ -services: - nextcloud-db: - image: docker.io/library/mariadb:11 - restart: always - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW - container_name: nextcloud-db - volumes: - - ./db:/var/lib/mysql:z - environment: - - MARIADB_DATABASE=${NEXTCLOUD_DATABASE:?} - - MARIADB_USER=${DATABASE_USER:?} - - MARIADB_PASSWORD=${DATABASE_PASSWORD:?} - - MARIADB_ROOT_PASSWORD=${DATABASE_ROOT_PASSWORD:?} - networks: - - private_cloud_network - - nextcloud-redis: - image: docker.io/library/redis:alpine - restart: always - container_name: nextcloud-redis - networks: - - private_cloud_network - - nextcloud: - image: docker.io/library/nextcloud:latest - restart: always - container_name: nextcloud - volumes: - - ${PATH_TO_FOLDER:?}:/var/www/external_storage:z - - ./data:/var/www/html/data:z - - ./config:/var/www/html/config:z - - ./apps:/var/www/html/custom_apps:z - #environment: - # - MYSQL_PASSWORD=${DATABASE_PASSWORD:?} - # - MYSQL_DATABASE=${NEXTCLOUD_DATABASE:?} - # - MYSQL_USER=${DATABASE_USER:?} - # - MYSQL_HOST=nextcloud-db - # - REDIS_HOST=nextcloud-redis - # - # - NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN:?} - # - NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_PASSWORD:?} - # - NEXTCLOUD_TRUSTED_DOMAINS=${NEXTCLOUD_DOMAIN:?} - depends_on: - - nextcloud-db - - nextcloud-redis - networks: - - cloud_network - - private_cloud_network - - nextcloud-collabora: - image: docker.io/collabora/code:latest - container_name: nextcloud-collabora - restart: always - environment: - - aliasgroup1=https://${NEXTCLOUD_DOMAIN:?} - - DONT_GEN_SSL_CERT=true - - server_name=${COLLABORA_DOMAIN:?} - - extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:net.post_allow.host[0]=.* - - username=${COLLABORA_ADMIN:?} - - password=${COLLABORA_PASSWORD:?} - networks: - - cloud_network - - private_cloud_network - -networks: - cloud_network: - name: cloud_network - driver: bridge - private_cloud_network: - name: private_cloud_network - driver: bridge diff --git a/homepage/src b/homepage/src index 4f76ca5..0af4406 160000 --- a/homepage/src +++ b/homepage/src @@ -1 +1 @@ -Subproject commit 4f76ca56012413c20fbee05d17fed5045ecaec26 +Subproject commit 0af4406f801d813de6a46b7b2c4575c3ccff9b60 diff --git a/proxy/ddns/domains.txt.example b/proxy/ddns/domains.txt.example index c234540..1c683b4 100644 --- a/proxy/ddns/domains.txt.example +++ b/proxy/ddns/domains.txt.example @@ -6,3 +6,4 @@ cloud matrix chat todo +download diff --git a/proxy/docker-compose.yml b/proxy/docker-compose.yml index 8ed5bc1..1bddba6 100644 --- a/proxy/docker-compose.yml +++ b/proxy/docker-compose.yml @@ -27,7 +27,9 @@ services: - matrix_network - memos_network - homepage_network - - cloud_network + #- cloud_network + #- rss_network + - cashflow_network certbot: image: docker.io/certbot/certbot @@ -86,6 +88,12 @@ networks: homepage_network: external: true name: homepage_network - cloud_network: + #cloud_network: + # external: true + # name: cloud_network + #rss_network: + # external: true + # name: rss_network + cashflow_network: external: true - name: cloud_network + name: cashflow_network diff --git a/proxy/nginx/conf.d/.default.conf.swp b/proxy/nginx/conf.d/.default.conf.swp deleted file mode 100644 index 188d447..0000000 Binary files a/proxy/nginx/conf.d/.default.conf.swp and /dev/null differ