diff --git a/.env.dev b/.env.dev index 51fa49d..12b7ad9 100644 --- a/.env.dev +++ b/.env.dev @@ -1,3 +1,3 @@ USER_UID=1000 USER_GID=1000 -FLAME_PASSWORD=securepassword123 +FLAME_PASSWORD=TheSecurityPasswordIsNumber1! diff --git a/.gitfield/push_log.json.tmp b/.gitfield/push_log.json.tmp new file mode 100644 index 0000000..e69de29 diff --git a/.gitfield/pushed.log b/.gitfield/pushed.log new file mode 100644 index 0000000..2efa0ea --- /dev/null +++ b/.gitfield/pushed.log @@ -0,0 +1,7 @@ +# Push Log for fold-stack +# Generated by gitfield-sync + +[2025-06-14T01:20:36Z] Local: , Branch=main, Commit=25fcf60 + Diff Summary: + .gitfield/local.sigil.md | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 59 insertions(+) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 994b19a..d66963f 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -68,22 +68,6 @@ services: networks: - fold-network - trilium: - image: zadam/trilium:latest - container_name: trilium_dev - ports: - - "8080:8080" - volumes: - - ./volumes/trilium:/home/node/trilium-data - restart: unless-stopped - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/api/health-check"] - interval: 10s - timeout: 5s - retries: 3 - networks: - - fold-network - hedgedoc: image: quay.io/hedgedoc/hedgedoc:1.9.9 container_name: hedgedoc_dev @@ -102,36 +86,8 @@ services: test: ["CMD", "curl", "-f", "http://localhost:3000/_health"] interval: 10s timeout: 5s - retries: 3 - networks: - - fold-network - - nextcloud: - image: nextcloud:stable - container_name: nextcloud_dev - ports: - - "8081:80" - volumes: - - ./volumes/nextcloud/html:/var/www/html - - ./volumes/nextcloud/data:/var/www/html/data - - ./volumes/scrolls:/var/www/html/data/admin/files/scrolls:ro - - ./volumes/ghost:/var/www/html/data/admin/files/ghost:ro - - ./volumes/trilium:/var/www/html/data/admin/files/trilium:ro - - ./volumes/hedgedoc/uploads:/var/www/html/data/admin/files/hedgedoc_uploads:ro - environment: - - NEXTCLOUD_ADMIN_USER=admin - - NEXTCLOUD_ADMIN_PASSWORD=admin_password - - NEXTCLOUD_TRUSTED_DOMAINS=localhost localhost:8081 - - NEXTCLOUD_DEFAULT_LANGUAGE=en - - NEXTCLOUD_OVERWRITEHOST=localhost - - NEXTCLOUD_OVERWRITEPROTOCOL=http - - NEXTCLOUD_OVERWRITEWEBROOT=/nextcloud - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost/status.php"] - interval: 10s - timeout: 5s - retries: 3 - restart: unless-stopped + retries: 5 + start_period: 30s networks: - fold-network @@ -159,55 +115,6 @@ services: networks: - fold-network - overleaf-mongo: - image: mongo:6 - container_name: overleaf_mongo_dev - volumes: - - ./volumes/overleaf/mongo:/data/db - healthcheck: - test: ["CMD", "mongo", "--eval", "db.adminCommand('ping')"] - interval: 10s - timeout: 5s - retries: 3 - networks: - - fold-network - - overleaf-redis: - image: redis:7 - container_name: overleaf_redis_dev - volumes: - - ./volumes/overleaf/redis:/data - healthcheck: - test: ["CMD", "redis-cli", "ping"] - interval: 10s - timeout: 5s - retries: 3 - networks: - - fold-network - - overleaf: - image: overleaf/compose-git:latest - container_name: overleaf_dev - ports: - - "8090:80" - volumes: - - ./volumes/overleaf/data:/var/lib/overleaf - - ./volumes/scrolls:/var/lib/overleaf/data/files:ro - environment: - - OVERLEAF_MONGO_URL=mongodb://overleaf-mongo:27017/overleaf - - OVERLEAF_REDIS_URL=redis://overleaf-redis:6379 - - OVERLEAF_LISTEN_IP=0.0.0.0 - - OVERLEAF_PORT=80 - - OVERLEAF_ADMIN_EMAIL=admin@example.com - - OVERLEAF_SITE_URL=http://localhost:8090 - depends_on: - overleaf-mongo: - condition: service_healthy - overleaf-redis: - condition: service_healthy - networks: - - fold-network - git-sync: build: ./git-sync container_name: git_sync_dev @@ -218,61 +125,6 @@ services: networks: - fold-network - flame_dashboard: - image: pawelmalak/flame:latest - container_name: flame_dashboard_dev - user: "1000:1000" - ports: - - "5005:5005" - volumes: - - ./volumes/flame:/app/data - environment: - - FLAME_PASSWORD=${FLAME_PASSWORD} - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:5005/health"] - interval: 10s - timeout: 5s - retries: 5 - cap_drop: - - ALL - cap_add: - - CHOWN - - SETGID - - SETUID - networks: - - fold-network - restart: unless-stopped - - nginx: - image: nginx:alpine - container_name: nginx_dev - ports: - - "80:80" - volumes: - - ./nginx/dev/default.conf:/etc/nginx/conf.d/default.conf:ro - - ./volumes/logs:/var/log/nginx - depends_on: - flame_dashboard: - condition: service_healthy - ghost: - condition: service_started - forgejo: - condition: service_started - trilium: - condition: service_healthy - hedgedoc: - condition: service_healthy - nextcloud: - condition: service_started - healthcheck: - test: ["CMD", "nginx", "-t"] - interval: 10s - timeout: 5s - retries: 3 - networks: - - fold-network - restart: unless-stopped - networks: fold-network: driver: bridge diff --git a/scripts/backup-trilium.sh b/scripts/backup-trilium.sh deleted file mode 100755 index ef58ee3..0000000 --- a/scripts/backup-trilium.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# Export Trilium notes as markdown -docker exec trilium_dev trilium-cli export /home/node/trilium-data /tmp/trilium-export --format markdown -# Copy the exported files to a backup directory -mkdir -p ./volumes/trilium-backup/export -docker cp trilium_dev:/tmp/trilium-export ./volumes/trilium-backup/export -# Dump the SQLite database -docker exec trilium_dev sqlite3 /home/node/trilium-data/document.db .dump > ./volumes/trilium-backup/document.sql diff --git a/scripts/fix-nextcloud-permissions.sh b/scripts/fix-nextcloud-permissions.sh new file mode 100755 index 0000000..70b7b0f --- /dev/null +++ b/scripts/fix-nextcloud-permissions.sh @@ -0,0 +1,4 @@ +#!/bin/bash +set -e +chown -R 33:33 /var/www/html /var/www/html/data +exec "$@" diff --git a/scripts/up-dev.sh b/scripts/up-dev.sh index 02e851e..355c7fe 100755 --- a/scripts/up-dev.sh +++ b/scripts/up-dev.sh @@ -1,6 +1,6 @@ #!/bin/bash set -e -echo "Starting fold-stack development environment (excluding Overleaf CE by default)..." -docker compose --env-file .env.dev -f docker-compose.dev.yml up -d --build ghost forgejo radicle pandoc mailhog trilium hedgedoc nextcloud rclone typst git-sync flame_dashboard nginx -echo "Core services started. To enable Overleaf CE, run: ./scripts/enable-overleaf.sh" +echo "Starting fold-stack development environment..." +docker compose --env-file .env.dev -f docker-compose.dev.yml up -d --build ghost forgejo radicle pandoc mailhog hedgedoc rclone typst git-sync +echo "Core services started."