diff --git a/arty.yml b/arty.yml index 64a5b73..635cb37 100644 --- a/arty.yml +++ b/arty.yml @@ -19,11 +19,6 @@ envs: CORE_REDIS_PORT: 6379 CORE_REDIS_IMAGE: redis:7-alpine CORE_POSTGRES_IMAGE: postgres:16-alpine - # VPN - VPN_TRAEFIK_ENABLED: true - VPN_COMPOSE_PROJECT_NAME: vpn - VPN_DOCKER_IMAGE: ghcr.io/wg-easy/wg-easy:latest - VPN_TRAEFIK_HOST: vpn.pivoine.art # Track TRACK_TRAEFIK_ENABLED: true TRACK_COMPOSE_PROJECT_NAME: track @@ -64,17 +59,6 @@ envs: TANDOOR_GUNICORN_MEDIA: 0 TANDOOR_COMMENT_PREF_DEFAULT: 1 TANDOOR_SHOPPING_MIN_AUTOSYNC_INTERVAL: 5 - # Scrapy - SCRAPY_TRAEFIK_ENABLED: true - SCRAPY_COMPOSE_PROJECT_NAME: scrapy - SCRAPY_SCRAPYD_IMAGE: vimagick/scrapyd - SCRAPY_IMAGE: vimagick/scrapyd - SCRAPY_SCRAPYRT_IMAGE: vimagick/scrapyd - SCRAPY_UI_IMAGE: ghcr.io/valknarness/scrapy-ui:main - SCRAPY_TRAEFIK_HOST: scrapy.pivoine.art - SCRAPY_SCRAPYD_PORT: 6800 - SCRAPY_SCRAPYRT_PORT: 9080 - SCRAPY_UI_SCRAPYD_URL: https://scrapy.pivoine.art/scrapyd # n8n N8N_TRAEFIK_ENABLED: true N8N_COMPOSE_PROJECT_NAME: n8n @@ -158,9 +142,6 @@ envs: PROXY_COMPOSE_PROJECT_NAME: proxy PROXY_DOCKER_IMAGE: traefik:latest PROXY_TRAEFIK_HOST: proxy.pivoine.art - # Sablier - SABLIER_COMPOSE_PROJECT_NAME: sablier - SABLIER_VERSION: latest # AI Stack AI_TRAEFIK_ENABLED: true AI_COMPOSE_PROJECT_NAME: ai diff --git a/compose.yaml b/compose.yaml index 630964e..521a6d1 100644 --- a/compose.yaml +++ b/compose.yaml @@ -4,7 +4,6 @@ include: - sexy/compose.yaml - mattermost/compose.yaml - tandoor/compose.yaml - - scrapy/compose.yaml - n8n/compose.yaml - links/compose.yaml - vault/compose.yaml @@ -15,7 +14,6 @@ include: - restic/compose.yaml - netdata/compose.yaml - umami/compose.yaml - - sablier/compose.yaml - proxy/compose.yaml - watch/compose.yaml - media/compose.yaml diff --git a/restic/compose.yaml b/restic/compose.yaml index 1382c71..953bf2d 100644 --- a/restic/compose.yaml +++ b/restic/compose.yaml @@ -24,8 +24,6 @@ services: - backup_mattermost_plugins:/volumes/mattermost_plugins:ro - backup_tandoor_staticfiles:/volumes/tandoor_staticfiles:ro - backup_tandoor_mediafiles:/volumes/tandoor_mediafiles:ro - - backup_scrapyd_data:/volumes/scrapyd_data:ro - - backup_scrapy_code:/volumes/scrapy_code:ro - backup_n8n_data:/volumes/n8n_data:ro - backup_filestash_data:/volumes/filestash_data:ro - backup_linkwarden_data:/volumes/linkwarden_data:ro @@ -108,12 +106,6 @@ volumes: backup_tandoor_mediafiles: name: tandoor_mediafiles external: true - backup_scrapyd_data: - name: scrapy_scrapyd_data - external: true - backup_scrapy_code: - name: scrapy_scrapy_code - external: true backup_n8n_data: name: n8n_n8n_data external: true diff --git a/restic/config.json b/restic/config.json index d999587..f89ad32 100644 --- a/restic/config.json +++ b/restic/config.json @@ -131,24 +131,6 @@ } } }, - { - "id": "scrapy-backup", - "repo": "hidrive-backup", - "paths": [ - "/volumes/scrapyd_data", - "/volumes/scrapy_code" - ], - "schedule": { - "cron": "0 6 * * *" - }, - "retention": { - "policyTimeBucketed": { - "daily": 7, - "weekly": 4, - "monthly": 3 - } - } - }, { "id": "n8n-backup", "repo": "hidrive-backup", diff --git a/sablier/compose.yaml b/sablier/compose.yaml deleted file mode 100644 index 862c9c0..0000000 --- a/sablier/compose.yaml +++ /dev/null @@ -1,21 +0,0 @@ -services: - sablier: - image: acouvreur/sablier:${SABLIER_VERSION:-latest} - container_name: ${SABLIER_COMPOSE_PROJECT_NAME}_app - restart: unless-stopped - command: - - start - - --provider.name=docker - volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro - networks: - - compose_network - environment: - TZ: ${TIMEZONE:-Europe/Berlin} - labels: - - 'traefik.enable=false' - -networks: - compose_network: - name: ${NETWORK_NAME} - external: true diff --git a/scrapy/compose.yaml b/scrapy/compose.yaml deleted file mode 100644 index caf76fd..0000000 --- a/scrapy/compose.yaml +++ /dev/null @@ -1,97 +0,0 @@ -services: - scrapyd: - image: ${SCRAPY_SCRAPYD_IMAGE:-vimagick/scrapyd} - container_name: ${SCRAPY_COMPOSE_PROJECT_NAME}_scrapyd - restart: unless-stopped - volumes: - - scrapyd_data:/var/lib/scrapyd - - /usr/local/lib/python3.9/dist-packages - environment: - TZ: ${TIMEZONE:-Europe/Berlin} - networks: - - compose_network - labels: - - 'traefik.enable=${SCRAPY_TRAEFIK_ENABLED}' - - 'traefik.http.middlewares.${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-redirect-web-secure.redirectscheme.scheme=https' - - 'traefik.http.routers.${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-web.middlewares=${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-redirect-web-secure' - - 'traefik.http.routers.${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-web.rule=Host(`${SCRAPY_TRAEFIK_HOST}`) && PathPrefix(`/scrapyd`)' - - 'traefik.http.routers.${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-web.entrypoints=web' - - 'traefik.http.routers.${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-web.priority=100' - - 'traefik.http.routers.${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-web-secure.rule=Host(`${SCRAPY_TRAEFIK_HOST}`) && PathPrefix(`/scrapyd`)' - - 'traefik.http.routers.${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-web-secure.tls.certresolver=resolver' - - 'traefik.http.routers.${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-web-secure.entrypoints=web-secure' - - 'traefik.http.routers.${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-web-secure.priority=100' - - 'traefik.http.middlewares.${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-stripprefix.stripprefix.prefixes=/scrapyd' - - 'traefik.http.middlewares.${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-auth.basicauth.users=${AUTH_USERS}' - - 'traefik.http.middlewares.${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-web-secure-compress.compress=true' - - 'traefik.http.routers.${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-web-secure.middlewares=${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-auth,${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-stripprefix,${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-web-secure-compress' - - 'traefik.http.services.${SCRAPY_COMPOSE_PROJECT_NAME}-scrapyd-web-secure.loadbalancer.server.port=6800' - - 'traefik.docker.network=${NETWORK_NAME}' - - 'com.centurylinklabs.watchtower.enable=${WATCHTOWER_LABEL_ENABLE}' - - scrapy: - image: ${SCRAPY_IMAGE:-vimagick/scrapyd} - container_name: ${SCRAPY_COMPOSE_PROJECT_NAME}_scrapy - command: bash - volumes: - - scrapy_code:/code - working_dir: /code - restart: unless-stopped - environment: - TZ: ${TIMEZONE:-Europe/Berlin} - networks: - - compose_network - - scrapyrt: - image: ${SCRAPY_SCRAPYRT_IMAGE:-vimagick/scrapyd} - container_name: ${SCRAPY_COMPOSE_PROJECT_NAME}_scrapyrt - command: scrapyrt -i 0.0.0.0 -p 9080 - restart: unless-stopped - ports: - - "${SCRAPY_SCRAPYRT_PORT:-9080}:9080" - volumes: - - scrapy_code:/code - working_dir: /code - environment: - TZ: ${TIMEZONE:-Europe/Berlin} - networks: - - compose_network - - scrapy_ui: - image: ${SCRAPY_UI_IMAGE:-ghcr.io/valknarness/scrapy-ui:main} - container_name: ${SCRAPY_COMPOSE_PROJECT_NAME}_ui - restart: unless-stopped - environment: - TZ: ${TIMEZONE:-Europe/Berlin} - NODE_ENV: production - SCRAPYD_URL: ${SCRAPY_UI_SCRAPYD_URL:-https://scrapy.pivoine.art/scrapyd} - SCRAPYD_USERNAME: ${SCRAPY_UI_SCRAPYD_USERNAME} - SCRAPYD_PASSWORD: ${SCRAPY_UI_SCRAPYD_PASSWORD} - networks: - - compose_network - labels: - - 'traefik.enable=${SCRAPY_TRAEFIK_ENABLED}' - - 'traefik.http.middlewares.${SCRAPY_COMPOSE_PROJECT_NAME}-ui-redirect-web-secure.redirectscheme.scheme=https' - - 'traefik.http.routers.${SCRAPY_COMPOSE_PROJECT_NAME}-ui-web.middlewares=${SCRAPY_COMPOSE_PROJECT_NAME}-ui-redirect-web-secure' - - 'traefik.http.routers.${SCRAPY_COMPOSE_PROJECT_NAME}-ui-web.rule=Host(`${SCRAPY_TRAEFIK_HOST}`)' - - 'traefik.http.routers.${SCRAPY_COMPOSE_PROJECT_NAME}-ui-web.entrypoints=web' - - 'traefik.http.routers.${SCRAPY_COMPOSE_PROJECT_NAME}-ui-web-secure.rule=Host(`${SCRAPY_TRAEFIK_HOST}`)' - - 'traefik.http.routers.${SCRAPY_COMPOSE_PROJECT_NAME}-ui-web-secure.tls.certresolver=resolver' - - 'traefik.http.routers.${SCRAPY_COMPOSE_PROJECT_NAME}-ui-web-secure.entrypoints=web-secure' - - 'traefik.http.middlewares.${SCRAPY_COMPOSE_PROJECT_NAME}-ui-auth.basicauth.users=${AUTH_USERS}' - - 'traefik.http.middlewares.${SCRAPY_COMPOSE_PROJECT_NAME}-ui-web-secure-compress.compress=true' - - 'traefik.http.routers.${SCRAPY_COMPOSE_PROJECT_NAME}-ui-web-secure.middlewares=${SCRAPY_COMPOSE_PROJECT_NAME}-ui-auth,${SCRAPY_COMPOSE_PROJECT_NAME}-ui-web-secure-compress' - - 'traefik.http.services.${SCRAPY_COMPOSE_PROJECT_NAME}-ui-web-secure.loadbalancer.server.port=3000' - - 'traefik.docker.network=${NETWORK_NAME}' - - 'com.centurylinklabs.watchtower.enable=${WATCHTOWER_LABEL_ENABLE}' - -volumes: - scrapyd_data: - name: ${SCRAPY_COMPOSE_PROJECT_NAME}_scrapyd_data - scrapy_code: - name: ${SCRAPY_COMPOSE_PROJECT_NAME}_scrapy_code - -networks: - compose_network: - name: ${NETWORK_NAME} - external: true diff --git a/sexy/uploads/009f5bad-9a8a-401e-9cb1-5792fa41337f.mp4 b/sexy/uploads/009f5bad-9a8a-401e-9cb1-5792fa41337f.mp4 deleted file mode 100644 index 537f685..0000000 Binary files a/sexy/uploads/009f5bad-9a8a-401e-9cb1-5792fa41337f.mp4 and /dev/null differ diff --git a/sexy/uploads/0a509923-853d-44e7-ad76-b6e6bdf89ba5.ico b/sexy/uploads/0a509923-853d-44e7-ad76-b6e6bdf89ba5.ico deleted file mode 100755 index f69f0f8..0000000 Binary files a/sexy/uploads/0a509923-853d-44e7-ad76-b6e6bdf89ba5.ico and /dev/null differ diff --git a/sexy/uploads/3001a83c-3033-4dd1-b3ac-c910bdb1ef2c.mp4 b/sexy/uploads/3001a83c-3033-4dd1-b3ac-c910bdb1ef2c.mp4 deleted file mode 100644 index d0b9075..0000000 Binary files a/sexy/uploads/3001a83c-3033-4dd1-b3ac-c910bdb1ef2c.mp4 and /dev/null differ diff --git a/sexy/uploads/318207c2-3846-4383-b0e2-60925992f781.png b/sexy/uploads/318207c2-3846-4383-b0e2-60925992f781.png deleted file mode 100644 index df9237a..0000000 Binary files a/sexy/uploads/318207c2-3846-4383-b0e2-60925992f781.png and /dev/null differ diff --git a/sexy/uploads/318207c2-3846-4383-b0e2-60925992f781__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif b/sexy/uploads/318207c2-3846-4383-b0e2-60925992f781__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif deleted file mode 100644 index 77a453e..0000000 Binary files a/sexy/uploads/318207c2-3846-4383-b0e2-60925992f781__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif and /dev/null differ diff --git a/sexy/uploads/498e539a-7c86-44e3-9824-9a5bb0cc979e.png b/sexy/uploads/498e539a-7c86-44e3-9824-9a5bb0cc979e.png deleted file mode 100644 index e66df97..0000000 Binary files a/sexy/uploads/498e539a-7c86-44e3-9824-9a5bb0cc979e.png and /dev/null differ diff --git a/sexy/uploads/498e539a-7c86-44e3-9824-9a5bb0cc979e__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif b/sexy/uploads/498e539a-7c86-44e3-9824-9a5bb0cc979e__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif deleted file mode 100644 index 737d67c..0000000 Binary files a/sexy/uploads/498e539a-7c86-44e3-9824-9a5bb0cc979e__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif and /dev/null differ diff --git a/sexy/uploads/4be0073d-a30a-4bd3-937c-4da917f3833f.png b/sexy/uploads/4be0073d-a30a-4bd3-937c-4da917f3833f.png deleted file mode 100644 index dd74dac..0000000 Binary files a/sexy/uploads/4be0073d-a30a-4bd3-937c-4da917f3833f.png and /dev/null differ diff --git a/sexy/uploads/4be0073d-a30a-4bd3-937c-4da917f3833f__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif b/sexy/uploads/4be0073d-a30a-4bd3-937c-4da917f3833f__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif deleted file mode 100644 index c3f89c6..0000000 Binary files a/sexy/uploads/4be0073d-a30a-4bd3-937c-4da917f3833f__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif and /dev/null differ diff --git a/sexy/uploads/6435caee-2da5-444a-b378-8c341bba6720.png b/sexy/uploads/6435caee-2da5-444a-b378-8c341bba6720.png deleted file mode 100644 index 65f9c9f..0000000 Binary files a/sexy/uploads/6435caee-2da5-444a-b378-8c341bba6720.png and /dev/null differ diff --git a/sexy/uploads/6435caee-2da5-444a-b378-8c341bba6720__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif b/sexy/uploads/6435caee-2da5-444a-b378-8c341bba6720__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif deleted file mode 100644 index 041484e..0000000 Binary files a/sexy/uploads/6435caee-2da5-444a-b378-8c341bba6720__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif and /dev/null differ diff --git a/sexy/uploads/69dfefa0-643d-44cd-8f08-bc68177a38a8.png b/sexy/uploads/69dfefa0-643d-44cd-8f08-bc68177a38a8.png deleted file mode 100644 index c40fdd0..0000000 Binary files a/sexy/uploads/69dfefa0-643d-44cd-8f08-bc68177a38a8.png and /dev/null differ diff --git a/sexy/uploads/69dfefa0-643d-44cd-8f08-bc68177a38a8__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif b/sexy/uploads/69dfefa0-643d-44cd-8f08-bc68177a38a8__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif deleted file mode 100644 index f717b8d..0000000 Binary files a/sexy/uploads/69dfefa0-643d-44cd-8f08-bc68177a38a8__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif and /dev/null differ diff --git a/sexy/uploads/7779e362-8703-411d-882d-690fd1970566.png b/sexy/uploads/7779e362-8703-411d-882d-690fd1970566.png deleted file mode 100644 index 815b4e0..0000000 Binary files a/sexy/uploads/7779e362-8703-411d-882d-690fd1970566.png and /dev/null differ diff --git a/sexy/uploads/7779e362-8703-411d-882d-690fd1970566__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif b/sexy/uploads/7779e362-8703-411d-882d-690fd1970566__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif deleted file mode 100644 index e61e251..0000000 Binary files a/sexy/uploads/7779e362-8703-411d-882d-690fd1970566__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif and /dev/null differ diff --git a/sexy/uploads/83c90c5c-5877-482c-8043-daa4d28e58de.png b/sexy/uploads/83c90c5c-5877-482c-8043-daa4d28e58de.png deleted file mode 100644 index 1be9fad..0000000 Binary files a/sexy/uploads/83c90c5c-5877-482c-8043-daa4d28e58de.png and /dev/null differ diff --git a/sexy/uploads/83c90c5c-5877-482c-8043-daa4d28e58de__7abd30a2f63f675625d6888e2ed9d65992751e3c.avif b/sexy/uploads/83c90c5c-5877-482c-8043-daa4d28e58de__7abd30a2f63f675625d6888e2ed9d65992751e3c.avif deleted file mode 100644 index 627855c..0000000 Binary files a/sexy/uploads/83c90c5c-5877-482c-8043-daa4d28e58de__7abd30a2f63f675625d6888e2ed9d65992751e3c.avif and /dev/null differ diff --git a/sexy/uploads/83c90c5c-5877-482c-8043-daa4d28e58de__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif b/sexy/uploads/83c90c5c-5877-482c-8043-daa4d28e58de__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif deleted file mode 100644 index 6c3f2d9..0000000 Binary files a/sexy/uploads/83c90c5c-5877-482c-8043-daa4d28e58de__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif and /dev/null differ diff --git a/sexy/uploads/8ad7e858-0c83-4d88-bb50-3680f1cfa9c2.png b/sexy/uploads/8ad7e858-0c83-4d88-bb50-3680f1cfa9c2.png deleted file mode 100755 index 091e8e0..0000000 Binary files a/sexy/uploads/8ad7e858-0c83-4d88-bb50-3680f1cfa9c2.png and /dev/null differ diff --git a/sexy/uploads/8ad7e858-0c83-4d88-bb50-3680f1cfa9c2__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif b/sexy/uploads/8ad7e858-0c83-4d88-bb50-3680f1cfa9c2__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif deleted file mode 100755 index 78fc13b..0000000 Binary files a/sexy/uploads/8ad7e858-0c83-4d88-bb50-3680f1cfa9c2__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif and /dev/null differ diff --git a/sexy/uploads/8ad7e858-0c83-4d88-bb50-3680f1cfa9c2__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif b/sexy/uploads/8ad7e858-0c83-4d88-bb50-3680f1cfa9c2__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif deleted file mode 100755 index c284877..0000000 Binary files a/sexy/uploads/8ad7e858-0c83-4d88-bb50-3680f1cfa9c2__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif and /dev/null differ diff --git a/sexy/uploads/9715bf21-05ce-4169-993b-a04edebe29af.png b/sexy/uploads/9715bf21-05ce-4169-993b-a04edebe29af.png deleted file mode 100644 index 3b8bb77..0000000 Binary files a/sexy/uploads/9715bf21-05ce-4169-993b-a04edebe29af.png and /dev/null differ diff --git a/sexy/uploads/9715bf21-05ce-4169-993b-a04edebe29af__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif b/sexy/uploads/9715bf21-05ce-4169-993b-a04edebe29af__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif deleted file mode 100644 index 0dd1cdc..0000000 Binary files a/sexy/uploads/9715bf21-05ce-4169-993b-a04edebe29af__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif and /dev/null differ diff --git a/sexy/uploads/b5c8e028-43c0-4eea-9b69-a3478d3f219b.png b/sexy/uploads/b5c8e028-43c0-4eea-9b69-a3478d3f219b.png deleted file mode 100644 index 7d29ad7..0000000 Binary files a/sexy/uploads/b5c8e028-43c0-4eea-9b69-a3478d3f219b.png and /dev/null differ diff --git a/sexy/uploads/b5c8e028-43c0-4eea-9b69-a3478d3f219b__7809681e43a17c0d8ad77890c0e89a2f36978e77.avif b/sexy/uploads/b5c8e028-43c0-4eea-9b69-a3478d3f219b__7809681e43a17c0d8ad77890c0e89a2f36978e77.avif deleted file mode 100644 index af6f550..0000000 Binary files a/sexy/uploads/b5c8e028-43c0-4eea-9b69-a3478d3f219b__7809681e43a17c0d8ad77890c0e89a2f36978e77.avif and /dev/null differ diff --git a/sexy/uploads/b85b3008-f592-4676-8c84-666e0a60423d.png b/sexy/uploads/b85b3008-f592-4676-8c84-666e0a60423d.png deleted file mode 100644 index b397cd6..0000000 Binary files a/sexy/uploads/b85b3008-f592-4676-8c84-666e0a60423d.png and /dev/null differ diff --git a/sexy/uploads/b85b3008-f592-4676-8c84-666e0a60423d__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif b/sexy/uploads/b85b3008-f592-4676-8c84-666e0a60423d__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif deleted file mode 100644 index 1989b72..0000000 Binary files a/sexy/uploads/b85b3008-f592-4676-8c84-666e0a60423d__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif and /dev/null differ diff --git a/sexy/uploads/b85b3008-f592-4676-8c84-666e0a60423d__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif b/sexy/uploads/b85b3008-f592-4676-8c84-666e0a60423d__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif deleted file mode 100644 index 95fecb3..0000000 Binary files a/sexy/uploads/b85b3008-f592-4676-8c84-666e0a60423d__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif and /dev/null differ diff --git a/sexy/uploads/bab78ff3-10bf-4fc6-9e3a-6e58bb6655b1.png b/sexy/uploads/bab78ff3-10bf-4fc6-9e3a-6e58bb6655b1.png deleted file mode 100644 index 76b4182..0000000 Binary files a/sexy/uploads/bab78ff3-10bf-4fc6-9e3a-6e58bb6655b1.png and /dev/null differ diff --git a/sexy/uploads/bab78ff3-10bf-4fc6-9e3a-6e58bb6655b1__7809681e43a17c0d8ad77890c0e89a2f36978e77.avif b/sexy/uploads/bab78ff3-10bf-4fc6-9e3a-6e58bb6655b1__7809681e43a17c0d8ad77890c0e89a2f36978e77.avif deleted file mode 100644 index abd5cc3..0000000 Binary files a/sexy/uploads/bab78ff3-10bf-4fc6-9e3a-6e58bb6655b1__7809681e43a17c0d8ad77890c0e89a2f36978e77.avif and /dev/null differ diff --git a/sexy/uploads/bab78ff3-10bf-4fc6-9e3a-6e58bb6655b1__7abd30a2f63f675625d6888e2ed9d65992751e3c.avif b/sexy/uploads/bab78ff3-10bf-4fc6-9e3a-6e58bb6655b1__7abd30a2f63f675625d6888e2ed9d65992751e3c.avif deleted file mode 100644 index 017afcc..0000000 Binary files a/sexy/uploads/bab78ff3-10bf-4fc6-9e3a-6e58bb6655b1__7abd30a2f63f675625d6888e2ed9d65992751e3c.avif and /dev/null differ diff --git a/sexy/uploads/bab78ff3-10bf-4fc6-9e3a-6e58bb6655b1__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif b/sexy/uploads/bab78ff3-10bf-4fc6-9e3a-6e58bb6655b1__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif deleted file mode 100644 index 63c79ae..0000000 Binary files a/sexy/uploads/bab78ff3-10bf-4fc6-9e3a-6e58bb6655b1__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif and /dev/null differ diff --git a/sexy/uploads/bab78ff3-10bf-4fc6-9e3a-6e58bb6655b1__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif b/sexy/uploads/bab78ff3-10bf-4fc6-9e3a-6e58bb6655b1__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif deleted file mode 100644 index 93dd371..0000000 Binary files a/sexy/uploads/bab78ff3-10bf-4fc6-9e3a-6e58bb6655b1__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif and /dev/null differ diff --git a/sexy/uploads/cecf7ce8-388a-43a9-b9bc-2ab4d44d3f7f.png b/sexy/uploads/cecf7ce8-388a-43a9-b9bc-2ab4d44d3f7f.png deleted file mode 100644 index c761f33..0000000 Binary files a/sexy/uploads/cecf7ce8-388a-43a9-b9bc-2ab4d44d3f7f.png and /dev/null differ diff --git a/sexy/uploads/cecf7ce8-388a-43a9-b9bc-2ab4d44d3f7f__7809681e43a17c0d8ad77890c0e89a2f36978e77.avif b/sexy/uploads/cecf7ce8-388a-43a9-b9bc-2ab4d44d3f7f__7809681e43a17c0d8ad77890c0e89a2f36978e77.avif deleted file mode 100644 index 48236bd..0000000 Binary files a/sexy/uploads/cecf7ce8-388a-43a9-b9bc-2ab4d44d3f7f__7809681e43a17c0d8ad77890c0e89a2f36978e77.avif and /dev/null differ diff --git a/sexy/uploads/cecf7ce8-388a-43a9-b9bc-2ab4d44d3f7f__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif b/sexy/uploads/cecf7ce8-388a-43a9-b9bc-2ab4d44d3f7f__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif deleted file mode 100644 index 2305e74..0000000 Binary files a/sexy/uploads/cecf7ce8-388a-43a9-b9bc-2ab4d44d3f7f__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif and /dev/null differ diff --git a/sexy/uploads/d3f53a9b-bbce-436c-a6f4-04e5ef120d7e.png b/sexy/uploads/d3f53a9b-bbce-436c-a6f4-04e5ef120d7e.png deleted file mode 100644 index d715c8d..0000000 Binary files a/sexy/uploads/d3f53a9b-bbce-436c-a6f4-04e5ef120d7e.png and /dev/null differ diff --git a/sexy/uploads/d3f53a9b-bbce-436c-a6f4-04e5ef120d7e__7809681e43a17c0d8ad77890c0e89a2f36978e77.avif b/sexy/uploads/d3f53a9b-bbce-436c-a6f4-04e5ef120d7e__7809681e43a17c0d8ad77890c0e89a2f36978e77.avif deleted file mode 100644 index b5f7996..0000000 Binary files a/sexy/uploads/d3f53a9b-bbce-436c-a6f4-04e5ef120d7e__7809681e43a17c0d8ad77890c0e89a2f36978e77.avif and /dev/null differ diff --git a/sexy/uploads/d3f53a9b-bbce-436c-a6f4-04e5ef120d7e__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif b/sexy/uploads/d3f53a9b-bbce-436c-a6f4-04e5ef120d7e__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif deleted file mode 100644 index bf9b29f..0000000 Binary files a/sexy/uploads/d3f53a9b-bbce-436c-a6f4-04e5ef120d7e__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif and /dev/null differ diff --git a/sexy/uploads/e77c58c1-f718-4b7a-b34c-c42861c8122f.png b/sexy/uploads/e77c58c1-f718-4b7a-b34c-c42861c8122f.png deleted file mode 100644 index 9625110..0000000 Binary files a/sexy/uploads/e77c58c1-f718-4b7a-b34c-c42861c8122f.png and /dev/null differ diff --git a/sexy/uploads/e77c58c1-f718-4b7a-b34c-c42861c8122f__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif b/sexy/uploads/e77c58c1-f718-4b7a-b34c-c42861c8122f__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif deleted file mode 100644 index f2b5afa..0000000 Binary files a/sexy/uploads/e77c58c1-f718-4b7a-b34c-c42861c8122f__e9dcbd6d37cf1a1351d2786febd96ceaf3ef6132.avif and /dev/null differ diff --git a/sexy/uploads/e77c58c1-f718-4b7a-b34c-c42861c8122f__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif b/sexy/uploads/e77c58c1-f718-4b7a-b34c-c42861c8122f__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif deleted file mode 100644 index 8c07cd0..0000000 Binary files a/sexy/uploads/e77c58c1-f718-4b7a-b34c-c42861c8122f__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif and /dev/null differ diff --git a/sexy/uploads/f718185e-fd82-4f16-971d-88baf2d069de.webp b/sexy/uploads/f718185e-fd82-4f16-971d-88baf2d069de.webp deleted file mode 100755 index b558351..0000000 Binary files a/sexy/uploads/f718185e-fd82-4f16-971d-88baf2d069de.webp and /dev/null differ diff --git a/sexy/uploads/f718185e-fd82-4f16-971d-88baf2d069de__7809681e43a17c0d8ad77890c0e89a2f36978e77.avif b/sexy/uploads/f718185e-fd82-4f16-971d-88baf2d069de__7809681e43a17c0d8ad77890c0e89a2f36978e77.avif deleted file mode 100755 index 34bc828..0000000 Binary files a/sexy/uploads/f718185e-fd82-4f16-971d-88baf2d069de__7809681e43a17c0d8ad77890c0e89a2f36978e77.avif and /dev/null differ diff --git a/sexy/uploads/f718185e-fd82-4f16-971d-88baf2d069de__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif b/sexy/uploads/f718185e-fd82-4f16-971d-88baf2d069de__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif deleted file mode 100755 index 8ed8a46..0000000 Binary files a/sexy/uploads/f718185e-fd82-4f16-971d-88baf2d069de__f15aa4b815722867859d2a3fa46ab50834dfc8dc.avif and /dev/null differ diff --git a/vpn/compose.yaml b/vpn/compose.yaml deleted file mode 100644 index 16b192b..0000000 --- a/vpn/compose.yaml +++ /dev/null @@ -1,67 +0,0 @@ -services: - vpn: - image: ${VPN_DOCKER_IMAGE} - container_name: ${VPN_COMPOSE_PROJECT_NAME}_app - restart: unless-stopped - volumes: - - etc_wireguard:/etc/wireguard - - /lib/modules:/lib/modules:ro - ports: - - "${VPN_WG_PORT:-51820}:51820/udp" - - "${VPN_APP_PORT:-51821}:51821/tcp" - cap_add: - - NET_ADMIN - - SYS_MODULE - sysctls: - - net.ipv4.ip_forward=1 - - net.ipv4.conf.all.src_valid_mark=1 - # - net.ipv6.conf.all.disable_ipv6=0 - # - net.ipv6.conf.all.forwarding=1 - # - net.ipv6.conf.default.forwarding=1 - environment: - TZ: ${TIMEZONE:-Europe/Amsterdam} - WG_HOST: ${VPN_WG_HOST} - WG_PORT: ${VPN_WG_PORT} - PORT: ${VPN_APP_PORT} - WG_DEVICE: eth0 - PASSWORD: ${VPN_PASSWORD} - LANG: ${VPN_LANG:-en} - UI_TRAFFIC_STATS: ${VPN_UI_TRAFFIC_STATS:-true} - UI_CHART_TYPE: ${VPN_UI_CHART_TYPE:-0} - WG_ALLOWED_IPS: ${VPN_WG_ALLOWED_IPS:-0.0.0.0/0, ::/0} - WG_DEFAULT_ADDRESS: ${VPN_WG_DEFAULT_ADDRESS:-10.8.0.x} - WG_DEFAULT_DNS: ${VPN_WG_DEFAULT_DNS:-1.1.1.1} - WG_PERSISTENT_KEEPALIVE: ${VPN_WG_PERSISTENT_KEEPALIVE:-25} - WG_MTU: ${VPN_WG_MTU:-1420} - networks: - wg: - ipv4_address: 10.42.42.42 - ipv6_address: fdcc:ad94:bacf:61a3::2a - compose_network: - labels: - - 'traefik.enable=${VPN_TRAEFIK_ENABLED:-true}' - - 'traefik.http.middlewares.${VPN_COMPOSE_PROJECT_NAME}-redirect-web-secure.redirectscheme.scheme=https' - - 'traefik.http.routers.${VPN_COMPOSE_PROJECT_NAME}-web.middlewares=${VPN_COMPOSE_PROJECT_NAME}-redirect-web-secure' - - 'traefik.http.routers.${VPN_COMPOSE_PROJECT_NAME}-web.rule=Host(`${VPN_TRAEFIK_HOST}`)' - - 'traefik.http.routers.${VPN_COMPOSE_PROJECT_NAME}-web.entrypoints=web' - - 'traefik.http.routers.${VPN_COMPOSE_PROJECT_NAME}-web-secure.rule=Host(`${VPN_TRAEFIK_HOST}`)' - - 'traefik.http.routers.${VPN_COMPOSE_PROJECT_NAME}-web-secure.tls.certresolver=resolver' - - 'traefik.http.routers.${VPN_COMPOSE_PROJECT_NAME}-web-secure.entrypoints=web-secure' - - 'traefik.http.middlewares.${VPN_COMPOSE_PROJECT_NAME}-web-secure-compress.compress=true' - - 'traefik.http.routers.${VPN_COMPOSE_PROJECT_NAME}-web-secure.middlewares=${VPN_COMPOSE_PROJECT_NAME}-web-secure-compress' - - 'traefik.http.services.${VPN_COMPOSE_PROJECT_NAME}-web-secure.loadbalancer.server.port=51821' - - 'traefik.docker.network=${NETWORK_NAME}' - -volumes: - etc_wireguard: - name: ${VPN_COMPOSE_PROJECT_NAME}_etc_wireguard - -networks: - wg: - driver: bridge - enable_ipv6: true - ipam: - driver: default - config: - - subnet: 10.42.42.0/24 - - subnet: fdcc:ad94:bacf:61a3::/64