diff --git a/README.md b/README.md index ec45354..b6186a9 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,6 @@ Edit the generated `.env` files to fill in the required fields: - `./sftpgo/.env` - `./vaultwarden/.env` - `./wg_easy/.env` -- `./blinko/.env` - `./ghost/.env` - `./caddy/.env` - `./caddy/Caddyfile.private` diff --git a/blinko/.env.example b/blinko/.env.example deleted file mode 100644 index 6f3c43a..0000000 --- a/blinko/.env.example +++ /dev/null @@ -1,4 +0,0 @@ -AUTH_SECRET= -POSTGRES_USER= -POSTGRES_PASSWORD= -POSTGRES_DB= \ No newline at end of file diff --git a/blinko/docker-compose.yml b/blinko/docker-compose.yml deleted file mode 100644 index 703eaa4..0000000 --- a/blinko/docker-compose.yml +++ /dev/null @@ -1,55 +0,0 @@ -networks: - blinko: - external: false - caddy: - name: caddy - driver: bridge - external: true - -services: - blinko-website: - image: blinkospace/blinko:1.2.2 - 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" - 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 192b9db..c0a9fc3 100644 --- a/caddy/.env.example +++ b/caddy/.env.example @@ -13,10 +13,10 @@ SLASH_DOMAIN= SLASH_CRT= SLASH_KEY= -############# Blinko ############# -BLINKO_DOMAIN= -BLINKO_CRT= -BLINKO_KEY= +############# Memos ############# +MEMOS_DOMAIN= +MEMOS_CRT= +MEMOS_KEY= ############# WG easy ############# WG_EASY_DOMAIN= diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 452138e..b1b5d62 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -57,15 +57,15 @@ } } -############## blinko ############## -{$BLINKO_DOMAIN} { - tls /etc/ssl/custom/{$BLINKO_CRT} /etc/ssl/custom/{$BLINKO_KEY} +############## memos ############## +{$MEMOS_DOMAIN} { + tls /etc/ssl/custom/{$MEMOS_CRT} /etc/ssl/custom/{$MEMOS_KEY} request_body { max_size 1024MB } - reverse_proxy http://blinko-website:1111 { + reverse_proxy http://memos:5230 { 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/glance/assets/blinko.png b/glance/assets/blinko.png deleted file mode 100644 index 5ccd64b..0000000 Binary files a/glance/assets/blinko.png and /dev/null differ diff --git a/glance/assets/memos.png b/glance/assets/memos.png new file mode 100644 index 0000000..029df08 Binary files /dev/null and b/glance/assets/memos.png differ diff --git a/glance/config/home.yml b/glance/config/home.yml index 715e9bf..3c291aa 100644 --- a/glance/config/home.yml +++ b/glance/config/home.yml @@ -22,7 +22,7 @@ icon: /assets/sftpgo.png - title: notes.aykhans.me url: https://notes.aykhans.me/signin - icon: /assets/blinko.png + icon: /assets/memos.png - title: url.aykhans.me url: https://url.aykhans.me/auth icon: /assets/slash.svg @@ -51,7 +51,7 @@ - glanceapp/glance - go-gitea/gitea - drakkan/sftpgo - - blinko-space/blinko + - usememos/memos - yourselfhosted/slash - dani-garcia/vaultwarden - wg-easy/wg-easy diff --git a/main.sh b/main.sh index b90c34c..9b15a39 100755 --- a/main.sh +++ b/main.sh @@ -60,7 +60,6 @@ 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 ./ghost/.env.example ./ghost/.env cp --update=none ./caddy/Caddyfile.private.example ./caddy/Caddyfile.private # cp --update=none ./slash/.env.example ./slash/.env @@ -110,12 +109,12 @@ start_services() { exit 1 fi - echo "Starting blinko..." - $DOCKER_COMPOSE_COMMAND -f ./blinko/docker-compose.yml up -d + echo "Starting memos..." + $DOCKER_COMPOSE_COMMAND -f ./memos/docker-compose.yml up -d if [ $? -eq 0 ]; then - print_success "Blinko started successfully." + print_success "Memos started successfully." else - print_error "failed to start Blinko!" + print_error "failed to start Memos!" exit 1 fi @@ -220,12 +219,12 @@ stop_services() { exit 1 fi - echo "Stopping blinko..." - $DOCKER_COMPOSE_COMMAND -f ./blinko/docker-compose.yml down + echo "Stopping memos..." + $DOCKER_COMPOSE_COMMAND -f ./memos/docker-compose.yml down if [ $? -eq 0 ]; then - print_success "Blinko stopped successfully." + print_success "Memos stopped successfully." else - print_error "failed to stop Blinko!" + print_error "failed to stop Memos!" exit 1 fi diff --git a/blinko/.gitignore b/memos/.gitignore similarity index 100% rename from blinko/.gitignore rename to memos/.gitignore diff --git a/blinko/data/.gitkeep b/memos/data/.gitkeep similarity index 100% rename from blinko/data/.gitkeep rename to memos/data/.gitkeep diff --git a/memos/docker-compose.yaml b/memos/docker-compose.yaml new file mode 100644 index 0000000..0ef6cc2 --- /dev/null +++ b/memos/docker-compose.yaml @@ -0,0 +1,16 @@ +networks: + caddy: + name: caddy + driver: bridge + external: true + +services: + memos: + image: neosmemo/memos:0.25 + container_name: memos + volumes: + - ./data/app:/var/opt/memos + ports: + - 5230:5230 + networks: + - caddy