Compare commits

...

4 Commits

13 changed files with 88 additions and 55 deletions

View File

@ -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`

4
blinko/.env.example Normal file
View File

@ -0,0 +1,4 @@
AUTH_SECRET=
POSTGRES_USER=
POSTGRES_PASSWORD=
POSTGRES_DB=

61
blinko/docker-compose.yml Normal file
View File

@ -0,0 +1,61 @@
networks:
blinko:
external: false
caddy:
name: caddy
driver: bridge
external: true
services:
blinko-website:
image: blinkospace/blinko:0.49.1
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

View File

@ -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=

View File

@ -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}

View File

@ -2,5 +2,4 @@
# Note: making changes to this file requires re-running docker compose up
MY_SECRET_TOKEN=
GITHUB_TOKEN=
MEMOS_TOKEN=
SERADAR_TOKEN=

BIN
glance/assets/blinko.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 237 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

View File

@ -22,9 +22,9 @@
- title: ftp.aykhans.me
url: https://ftp.aykhans.me/web/client/login
icon: /assets/sftpgo.png
- title: mem.aykhans.me
url: https://mem.aykhans.me/explore
icon: /assets/memos.webp
- title: notes.aykhans.me
url: https://notes.aykhans.me/signin
icon: /assets/blinko.png
- title: url.aykhans.me
url: https://url.aykhans.me/auth
icon: /assets/slash.svg
@ -50,27 +50,13 @@
- glanceapp/glance
- go-gitea/gitea
- drakkan/sftpgo
- usememos/memos
- blinko-space/blinko
- yourselfhosted/slash
- dani-garcia/vaultwarden
- wg-easy/wg-easy
- size: full
widgets:
- type: custom-api
title: Memos
cache: 1m
url: https://mem.aykhans.me/api/v1/memos/8ZU65KaQkWobmT8qfKqMyd
headers:
Accept: application/json
Authorization: Bearer ${MEMOS_TOKEN}
template: |
{{ if eq .Response.StatusCode 200 }}
<div style="white-space: pre-wrap;">{{ .JSON.String "content" }}</div>
{{ else }}
<p class="color-negative">Failed to fetch Memos data</p>
{{ end }}
- type: group
widgets:
- type: hacker-news

18
main.sh
View File

@ -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

View File

@ -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