diff --git a/Makefile b/Makefile index 89a7ac0..7c82c60 100644 --- a/Makefile +++ b/Makefile @@ -13,10 +13,10 @@ DOCKER := docker -PROFILES := caddy wordpress adminer ghost syncthing uptime-kuma jellyfin qbittorrent psitransfer gitea it-tools privatebin homepage watchtower +PROFILES := caddy wordpress adminer ghost syncthing uptime-kuma jellyfin qbittorrent psitransfer gitea it-tools privatebin homepage PROFILE_CMD := $(addprefix --profile ,$(PROFILES)) -# gitea-runner transmission +# gitea-runner transmission dozzle watchtower COMPOSE_FILES := $(shell find . -name 'docker-compose*.yml' -type f | sed -e 's/^/--file /') diff --git a/infrastructure/caddy/config/bensuperpc.org/Caddyfile b/infrastructure/caddy/config/bensuperpc.org/Caddyfile index e0221bb..e969bb8 100644 --- a/infrastructure/caddy/config/bensuperpc.org/Caddyfile +++ b/infrastructure/caddy/config/bensuperpc.org/Caddyfile @@ -28,7 +28,7 @@ www.bensuperpc.org { X-Content-Type-Options nosniff # clickjacking protection - X-Frame-Options DENY + # X-Frame-Options DENY # Disable powerful features we don't need Permissions-Policy "geolocation=(), camera=(), microphone=() interest-cohort=()" @@ -109,6 +109,10 @@ ghost.bensuperpc.org { reverse_proxy ghost:2368 } +dozzle.bensuperpc.org { + reverse_proxy dozzle:8080 +} + link.bensuperpc.org { # TODO: Use service with database # Friendly links diff --git a/infrastructure/dozzle/docker-compose.dozzle.yml b/infrastructure/dozzle/docker-compose.dozzle.yml new file mode 100644 index 0000000..c5f7059 --- /dev/null +++ b/infrastructure/dozzle/docker-compose.dozzle.yml @@ -0,0 +1,18 @@ +services: + # dozzle + dozzle: + image: amir20/dozzle:latest + container_name: dozzle + profiles: + - dozzle + restart: on-failure:5 + depends_on: + - caddy + env_file: + - ./dozzle/env/dozzle.env + volumes: + - /var/run/docker.sock:/var/run/docker.sock:ro + networks: + - infra-network + security_opt: + - no-new-privileges:true diff --git a/infrastructure/dozzle/env/dozzle.env b/infrastructure/dozzle/env/dozzle.env new file mode 100644 index 0000000..33dd58e --- /dev/null +++ b/infrastructure/dozzle/env/dozzle.env @@ -0,0 +1 @@ +DOZZLE_LEVEL=info diff --git a/infrastructure/homepage/config/services.yaml b/infrastructure/homepage/config/services.yaml index c40fed9..d1c82ff 100644 --- a/infrastructure/homepage/config/services.yaml +++ b/infrastructure/homepage/config/services.yaml @@ -25,6 +25,10 @@ icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/psitransfer.png href: https://psitransfer.bensuperpc.org/ description: PsiTransfer + - privatebin: + icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/privatebin.png + href: https://privatebin.bensuperpc.org/ + description: PrivateBin - qbittorrent: icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/qbittorrent.png href: https://qbittorrent.bensuperpc.org/ diff --git a/infrastructure/homepage/config/settings.yaml b/infrastructure/homepage/config/settings.yaml index b73ad9f..505b814 100644 --- a/infrastructure/homepage/config/settings.yaml +++ b/infrastructure/homepage/config/settings.yaml @@ -11,7 +11,7 @@ base: https://homepage.bensuperpc.org logpath: /app/logs background: - image: /images/deep.jpg + image: /images/electronic.jpg blur: md opacity: 50 brightness: 50 diff --git a/infrastructure/homepage/image/deep.jpg b/infrastructure/homepage/image/deep.jpg deleted file mode 100644 index aeb7d7e..0000000 Binary files a/infrastructure/homepage/image/deep.jpg and /dev/null differ diff --git a/infrastructure/homepage/image/electronic.jpg b/infrastructure/homepage/image/electronic.jpg new file mode 100644 index 0000000..90a96b9 Binary files /dev/null and b/infrastructure/homepage/image/electronic.jpg differ