From 11389f599507eb643fa40d5ebe06901f227494a7 Mon Sep 17 00:00:00 2001 From: Opnxng Date: Sun, 11 Aug 2024 21:41:34 +0800 Subject: [PATCH] Removed Libreddit --- templates/compose/anonymousoverflow.yaml.j2 | 2 +- templates/compose/breezewiki.yaml.j2 | 6 +-- templates/compose/cloudtube.yaml.j2 | 4 +- templates/compose/firefox.yaml.j2 | 4 +- templates/compose/geoipupdate.yaml.j2 | 2 +- templates/compose/gitea.yaml.j2 | 2 +- templates/compose/gothub.yaml.j2 | 6 +-- templates/compose/imgin.yaml.j2 | 4 +- templates/compose/invidious.yaml.j2 | 2 +- templates/compose/it-tools.yaml.j2 | 2 +- templates/compose/libreddit.yaml.j2 | 42 --------------------- templates/compose/ntfy.yaml.j2 | 4 +- templates/compose/photon.yaml.j2 | 2 +- templates/compose/privatebin.yaml.j2 | 8 ++-- templates/compose/priviblur.yaml.j2 | 14 +++---- templates/compose/proxitok.yaml.j2 | 4 +- templates/compose/quetre.yaml.j2 | 4 +- templates/compose/rat-aint-tieba.yaml.j2 | 4 +- templates/compose/runner.yaml.j2 | 2 +- templates/compose/voyager.yaml.j2 | 4 +- templates/compose/wolfree.yaml.j2 | 4 +- 21 files changed, 41 insertions(+), 85 deletions(-) delete mode 100644 templates/compose/libreddit.yaml.j2 diff --git a/templates/compose/anonymousoverflow.yaml.j2 b/templates/compose/anonymousoverflow.yaml.j2 index 2e30f88..d5fc831 100644 --- a/templates/compose/anonymousoverflow.yaml.j2 +++ b/templates/compose/anonymousoverflow.yaml.j2 @@ -15,7 +15,7 @@ services: - JWT_SIGNING_SECRET="{{ anonymousoverflow_jwt_secret }}" restart: unless-stopped ports: - - '8898:8080' + - 8898:8080 networks: - anonymousoverflow diff --git a/templates/compose/breezewiki.yaml.j2 b/templates/compose/breezewiki.yaml.j2 index 39ef2de..4358099 100644 --- a/templates/compose/breezewiki.yaml.j2 +++ b/templates/compose/breezewiki.yaml.j2 @@ -10,13 +10,13 @@ services: - PGID=1000 - TZ=Asia/Singapore restart: unless-stopped - ports: - - '8897:10416' volumes: - {{ docker_dir }}/breezewiki/config.ini:/app/config.ini + ports: + - 8897:10416 networks: - breezewiki networks: breezewiki: - name: breezewiki \ No newline at end of file + name: breezewiki diff --git a/templates/compose/cloudtube.yaml.j2 b/templates/compose/cloudtube.yaml.j2 index c8cafe0..08fa787 100644 --- a/templates/compose/cloudtube.yaml.j2 +++ b/templates/compose/cloudtube.yaml.j2 @@ -11,14 +11,14 @@ services: - PUID=1000 - PGID=1000 - TZ=Asia/Singapore - ports: - - 8911:10412 depends_on: - newleaf restart: unless-stopped volumes: - {{ docker_dir }}/cloudtube/db:/workdir/db - {{ docker_dir }}/cloudtube/config.js:/workdir/config/config.js #instance should be "http://newleaf:3000" + ports: + - 8911:10412 networks: - cloudtube diff --git a/templates/compose/firefox.yaml.j2 b/templates/compose/firefox.yaml.j2 index ca8b368..625f4ea 100644 --- a/templates/compose/firefox.yaml.j2 +++ b/templates/compose/firefox.yaml.j2 @@ -23,7 +23,7 @@ services: # devices: # - /dev/dri:/dev/dri ports: - - '8893:8893' + - 8893:8893 shm_size: "2gb" restart: unless-stopped networks: @@ -32,5 +32,3 @@ services: networks: firefox: name: firefox - - diff --git a/templates/compose/geoipupdate.yaml.j2 b/templates/compose/geoipupdate.yaml.j2 index 74421c5..bf8bdec 100644 --- a/templates/compose/geoipupdate.yaml.j2 +++ b/templates/compose/geoipupdate.yaml.j2 @@ -21,4 +21,4 @@ services: networks: geoipupdate: - name: geoipupdate \ No newline at end of file + name: geoipupdate diff --git a/templates/compose/gitea.yaml.j2 b/templates/compose/gitea.yaml.j2 index bde946b..87d0950 100644 --- a/templates/compose/gitea.yaml.j2 +++ b/templates/compose/gitea.yaml.j2 @@ -27,7 +27,7 @@ services: depends_on: - gitea-db ports: - - "8885:3000" + - 8885:3000 networks: - gitea diff --git a/templates/compose/gothub.yaml.j2 b/templates/compose/gothub.yaml.j2 index 8defa33..2c2a7cf 100644 --- a/templates/compose/gothub.yaml.j2 +++ b/templates/compose/gothub.yaml.j2 @@ -1,7 +1,7 @@ # {{ ansible_managed }} services: gothub: - image: codeberg.org/gothub/gothub:latest + image: codeberg.org/gothub/gothub:latest container_name: gothub security_opt: - no-new-privileges @@ -27,10 +27,10 @@ services: retries: 2 restart: unless-stopped ports: - - '8900:3000' + - 8900:3000 networks: - gothub networks: gothub: - name: gothub \ No newline at end of file + name: gothub diff --git a/templates/compose/imgin.yaml.j2 b/templates/compose/imgin.yaml.j2 index 84d4408..d6da6d7 100644 --- a/templates/compose/imgin.yaml.j2 +++ b/templates/compose/imgin.yaml.j2 @@ -12,10 +12,10 @@ services: - BUILDX_GIT_INFO=false restart: unless-stopped ports: - - '8899:8080' + - 8899:8080 networks: - imgin networks: imgin: - name: imgin \ No newline at end of file + name: imgin diff --git a/templates/compose/invidious.yaml.j2 b/templates/compose/invidious.yaml.j2 index a02357e..7b8ace8 100644 --- a/templates/compose/invidious.yaml.j2 +++ b/templates/compose/invidious.yaml.j2 @@ -68,7 +68,7 @@ services: depends_on: - invidious ports: - - '8911:3000' + - 8911:3000 networks: - invidious diff --git a/templates/compose/it-tools.yaml.j2 b/templates/compose/it-tools.yaml.j2 index 52a69ce..8db17da 100644 --- a/templates/compose/it-tools.yaml.j2 +++ b/templates/compose/it-tools.yaml.j2 @@ -17,4 +17,4 @@ services: networks: it-tools: - name: it-tools \ No newline at end of file + name: it-tools diff --git a/templates/compose/libreddit.yaml.j2 b/templates/compose/libreddit.yaml.j2 deleted file mode 100644 index c025189..0000000 --- a/templates/compose/libreddit.yaml.j2 +++ /dev/null @@ -1,42 +0,0 @@ -# {{ ansible_managed }} -services: - libreddit-warp: - image: caomingjun/warp - container_name: libreddit-warp - restart: always - environment: - - WARP_SLEEP=2 - cap_add: - - NET_ADMIN - sysctls: - - net.ipv6.conf.all.disable_ipv6=0 - - net.ipv4.conf.all.src_valid_mark=1 - volumes: - - {{ docker_dir }}/libreddit:/var/lib/cloudflare-warp - ports: - - 8882:8080 - networks: - - libreddit - - libreddit: - container_name: libreddit -# image: libreddit/libreddit:latest - image: git.opnxng.com/opnxng/libreddit:latest - security_opt: - - no-new-privileges - environment: - - PUID=1000 - - PGID=1000 - - TZ=Asia/Singapore - - LIBREDDIT_DEFAULT_THEME=black - - LIBREDDIT_DEFAULT_SHOW_NSFW=on - restart: unless-stopped - healthcheck: - test: ["CMD", "wget", "--spider", "-q", "--tries=1", "http://localhost:8080/settings"] - interval: 5m - timeout: 3s - network_mode: "service:libreddit-warp" - -networks: - libreddit: - name: libreddit diff --git a/templates/compose/ntfy.yaml.j2 b/templates/compose/ntfy.yaml.j2 index bb469ed..799534f 100644 --- a/templates/compose/ntfy.yaml.j2 +++ b/templates/compose/ntfy.yaml.j2 @@ -22,7 +22,7 @@ services: - {{ docker_dir }}/ntfy/user.db:/var/lib/ntfy/user.db restart: unless-stopped ports: - - '8894:80' + - 8894:80 healthcheck: # optional: remember to adapt the host:port to your environment test: ["CMD-SHELL", "wget -q --tries=1 http://localhost:80/v1/health -O - | grep -Eo '\"healthy\"\\s*:\\s*true' || exit 1"] interval: 60s @@ -38,4 +38,4 @@ networks: # touch {{ docker_dir }}/ntfy/cache.db && touch {{ docker_dir }}/ntfy/user.db # docker exec -it ntfy ntfy user add --role=admin opnxng -# docker exec -it ntfy ntfy token add opnxng \ No newline at end of file +# docker exec -it ntfy ntfy token add opnxng diff --git a/templates/compose/photon.yaml.j2 b/templates/compose/photon.yaml.j2 index e840202..3e55c89 100644 --- a/templates/compose/photon.yaml.j2 +++ b/templates/compose/photon.yaml.j2 @@ -15,7 +15,7 @@ services: - PUBLIC_LOCK_TO_INSTANCE=false restart: unless-stopped ports: - - '8903:3000' + - 8903:3000 networks: - photon diff --git a/templates/compose/privatebin.yaml.j2 b/templates/compose/privatebin.yaml.j2 index 155fee7..3e8fb83 100644 --- a/templates/compose/privatebin.yaml.j2 +++ b/templates/compose/privatebin.yaml.j2 @@ -7,11 +7,11 @@ services: - no-new-privileges environment: - TZ=Asia/Singapore - restart: unless-stopped - ports: - - 8884:8080 + restart: unless-stopped volumes: - {{ docker_dir }}/privatebin/data:/srv/data + ports: + - 8884:8080 networks: - privatebin @@ -19,4 +19,4 @@ networks: privatebin: name: privatebin -# sudo chown -R 65534:82 {{ docker_dir }}/privatebin/data \ No newline at end of file +# sudo chown -R 65534:82 {{ docker_dir }}/privatebin/data diff --git a/templates/compose/priviblur.yaml.j2 b/templates/compose/priviblur.yaml.j2 index fe257c2..1c5dad9 100644 --- a/templates/compose/priviblur.yaml.j2 +++ b/templates/compose/priviblur.yaml.j2 @@ -24,13 +24,7 @@ services: command: valkey-server --save 30 1 --loglevel warning security_opt: - no-new-privileges - environment: - #- PUID=1000 - #- PGID=1000 - - TZ=Asia/Singapore - volumes: - - {{ docker_dir }}/priviblur/valkey-data:/data - user: "999:1000" + user: 999:1000 read_only: true cap_drop: - ALL @@ -38,6 +32,12 @@ services: - SETGID - SETUID - DAC_OVERRIDE + environment: + #- PUID=1000 + #- PGID=1000 + - TZ=Asia/Singapore + volumes: + - {{ docker_dir }}/priviblur/valkey-data:/data restart: unless-stopped networks: - priviblur diff --git a/templates/compose/proxitok.yaml.j2 b/templates/compose/proxitok.yaml.j2 index 9ca525d..ae52a4a 100644 --- a/templates/compose/proxitok.yaml.j2 +++ b/templates/compose/proxitok.yaml.j2 @@ -30,7 +30,7 @@ services: - signer networks: - proxitok - + proxitok-redis: container_name: proxitok-redis image: redis:alpine @@ -70,4 +70,4 @@ services: networks: proxitok: - name: proxitok \ No newline at end of file + name: proxitok diff --git a/templates/compose/quetre.yaml.j2 b/templates/compose/quetre.yaml.j2 index 7513912..3f637a1 100644 --- a/templates/compose/quetre.yaml.j2 +++ b/templates/compose/quetre.yaml.j2 @@ -13,10 +13,10 @@ services: - PORT=3000 ports: - 8904:3000 - restart: unless-stopped + restart: unless-stopped networks: - quetre networks: quetre: - name: quetre \ No newline at end of file + name: quetre diff --git a/templates/compose/rat-aint-tieba.yaml.j2 b/templates/compose/rat-aint-tieba.yaml.j2 index c2f2eba..36c7ba6 100644 --- a/templates/compose/rat-aint-tieba.yaml.j2 +++ b/templates/compose/rat-aint-tieba.yaml.j2 @@ -11,10 +11,10 @@ services: - TZ=Asia/Singapore restart: unless-stopped ports: - - '8910:8886' + - 8910:8886 networks: - rat-aint-tieba networks: rat-aint-tieba: - name: rat-aint-tieba \ No newline at end of file + name: rat-aint-tieba diff --git a/templates/compose/runner.yaml.j2 b/templates/compose/runner.yaml.j2 index d18044f..eab7f88 100755 --- a/templates/compose/runner.yaml.j2 +++ b/templates/compose/runner.yaml.j2 @@ -28,4 +28,4 @@ networks: name: runner # DinD containers cannot resolve *.github.com unless daemon.json is mounted -# https://gitea.com/gitea/act_runner/issues/381#issuecomment-755182 \ No newline at end of file +# https://gitea.com/gitea/act_runner/issues/381#issuecomment-755182 diff --git a/templates/compose/voyager.yaml.j2 b/templates/compose/voyager.yaml.j2 index 7bb696b..e8417c4 100644 --- a/templates/compose/voyager.yaml.j2 +++ b/templates/compose/voyager.yaml.j2 @@ -12,10 +12,10 @@ services: - CUSTOM_LEMMY_SERVERS=lemm.ee,lemmy.pussthecat.org,lemmy.ml,hexbear.net,sh.itjust.works,beehaw.org,lemmy.world restart: unless-stopped ports: - - '8895:5314' + - 8895:5314 networks: - voyager networks: voyager: - name: voyager \ No newline at end of file + name: voyager diff --git a/templates/compose/wolfree.yaml.j2 b/templates/compose/wolfree.yaml.j2 index 4e9b9e7..f2f12e7 100644 --- a/templates/compose/wolfree.yaml.j2 +++ b/templates/compose/wolfree.yaml.j2 @@ -11,10 +11,10 @@ services: - TZ=Asia/Singapore restart: unless-stopped ports: - - '8906:80' + - 8906:80 networks: - wolfree networks: wolfree: - name: wolfree \ No newline at end of file + name: wolfree