diff --git a/README.md b/README.md index 8d3c4f1..6a19f86 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ Edit the generated `.env` files to fill in the required fields: - `./sftpgo/.env` - `./vaultwarden/.env` - `./wg_easy/.env` +- `./blinko/.env` - `./caddy/.env` - `./caddy/Caddyfile.private` diff --git a/blinko/.env.example b/blinko/.env.example new file mode 100644 index 0000000..6f3c43a --- /dev/null +++ b/blinko/.env.example @@ -0,0 +1,4 @@ +AUTH_SECRET= +POSTGRES_USER= +POSTGRES_PASSWORD= +POSTGRES_DB= \ No newline at end of file diff --git a/memos/.gitignore b/blinko/.gitignore similarity index 100% rename from memos/.gitignore rename to blinko/.gitignore diff --git a/memos/data/.gitkeep b/blinko/data/.gitkeep similarity index 100% rename from memos/data/.gitkeep rename to blinko/data/.gitkeep diff --git a/blinko/docker-compose.yml b/blinko/docker-compose.yml new file mode 100644 index 0000000..3030d8e --- /dev/null +++ b/blinko/docker-compose.yml @@ -0,0 +1,61 @@ +networks: + blinko: + external: false + caddy: + name: caddy + driver: bridge + external: true + +services: + blinko-website: + image: blinkospace/blinko:latest + container_name: blinko-website + environment: + NODE_ENV: production + NEXTAUTH_SECRET: ${AUTH_SECRET} + DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@blinko-postgres:5432/${POSTGRES_DB} + depends_on: + postgres: + condition: service_healthy + volumes: + - ./data/app:/app/.blinko + restart: unless-stopped + logging: + options: + max-size: "10m" + max-file: "3" + healthcheck: + test: ["CMD", "curl", "-f", "http://blinko-website:1111/"] + interval: 30s + timeout: 10s + retries: 5 + start_period: 30s + networks: + - blinko + - caddy + + postgres: + image: postgres:14 + container_name: blinko-postgres + restart: unless-stopped + environment: + POSTGRES_DB: ${POSTGRES_DB} + POSTGRES_USER: ${POSTGRES_USER} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + volumes: + - ./data/db:/var/lib/postgresql/data + healthcheck: + test: + [ + "CMD", + "pg_isready", + "-U", + "${POSTGRES_USER}", + "-d", + "${POSTGRES_DB}", + ] + interval: 5s + timeout: 10s + retries: 5 + networks: + - blinko diff --git a/caddy/.env.example b/caddy/.env.example index d8e241a..9656ba8 100644 --- a/caddy/.env.example +++ b/caddy/.env.example @@ -8,10 +8,10 @@ SLASH_DOMAIN= SLASH_CRT= SLASH_KEY= -############# Memos ############# -MEMOS_DOMAIN= -MEMOS_CRT= -MEMOS_KEY= +############# Blinko ############# +BLINKO_DOMAIN= +BLINKO_CRT= +BLINKO_KEY= ############# WG easy ############# WG_EASY_DOMAIN= diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 84bab4a..269917c 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -34,15 +34,15 @@ } } -############## memos ############## -{$MEMOS_DOMAIN} { - tls /etc/ssl/custom/{$MEMOS_CRT} /etc/ssl/custom/{$MEMOS_KEY} +############## blinko ############## +{$BLINKO_DOMAIN} { + tls /etc/ssl/custom/{$BLINKO_CRT} /etc/ssl/custom/{$BLINKO_KEY} request_body { - max_size 128MB + max_size 1024MB } - reverse_proxy http://memos:5230 { + reverse_proxy http://blinko-website:1111 { header_up X-Real-IP {http.request.header.Cf-Connecting-Ip} header_up X-Forwarded-For {http.request.header.Cf-Connecting-Ip} header_up X-Country-Code {http.request.header.Cf-Ipcountry} diff --git a/main.sh b/main.sh index d339c4a..b4bbc18 100755 --- a/main.sh +++ b/main.sh @@ -60,8 +60,8 @@ generate_env_files() { cp --update=none ./wg_easy/.env.example ./wg_easy/.env cp --update=none ./caddy/.env.example ./caddy/.env cp --update=none ./glance/.env.example ./glance/.env + cp --update=none ./blinko/.env.example ./blinko/.env cp --update=none ./caddy/Caddyfile.private.example ./caddy/Caddyfile.private - # cp --update=none ./memos/.env.example ./memos/.env # cp --update=none ./slash/.env.example ./slash/.env print_success ".env files generated." } @@ -78,12 +78,12 @@ start_services() { exit 1 fi - echo "Starting memos..." - $DOCKER_COMPOSE_COMMAND -f ./memos/docker-compose.yml up -d + echo "Starting blinko..." + $DOCKER_COMPOSE_COMMAND -f ./blinko/docker-compose.yml up -d if [ $? -eq 0 ]; then - print_success "Memos started successfully." + print_success "Blinko started successfully." else - print_error "failed to start Memos!" + print_error "failed to start Blinko!" exit 1 fi @@ -152,12 +152,12 @@ stop_services() { exit 1 fi - echo "Stopping memos..." - $DOCKER_COMPOSE_COMMAND -f ./memos/docker-compose.yml down + echo "Stopping blinko..." + $DOCKER_COMPOSE_COMMAND -f ./blinko/docker-compose.yml down if [ $? -eq 0 ]; then - print_success "Memos stopped successfully." + print_success "Blinko stopped successfully." else - print_error "failed to stop Memos!" + print_error "failed to stop Blinko!" exit 1 fi diff --git a/memos/docker-compose.yml b/memos/docker-compose.yml deleted file mode 100644 index 57a3ade..0000000 --- a/memos/docker-compose.yml +++ /dev/null @@ -1,18 +0,0 @@ -networks: - memos: - external: false - caddy: - name: caddy - driver: bridge - external: true - -services: - server: - image: neosmemo/memos:0.24.2 - container_name: memos - restart: unless-stopped - networks: - - memos - - caddy - volumes: - - ./data/:/var/opt/memos