Removed Teddit

config-tasks/teddit.yaml

@@ -1,15 +0,0 @@
-    - name: Copy topbar.pug
-      copy:
-        src: "teddit/topbar.pug"
-        dest: "{{ docker_dir }}/teddit/topbar.pug"
-        owner: 1000
-        group: 1000
-        mode: 0755
-
-    - name: Copy about.pug
-      copy:
-        src: "teddit/about.pug"
-        dest: "{{ docker_dir }}/teddit/about.pug"
-        owner: 1000
-        group: 1000
-        mode: 0755

templates/compose/teddit.yaml.j2

@@ -1,71 +0,0 @@
-# {{ ansible_managed }}
-version: "3.8"
-services:
-  teddit-warp:
-    image: caomingjun/warp
-    container_name: teddit-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 }}/teddit:/var/lib/cloudflare-warp
-    ports:
-      - 8881:8080
-      - 6379:6379
-    networks:
-      - teddit
-
-  teddit:
-    container_name: teddit
-    image: teddit/teddit:latest
-    security_opt:
-      - no-new-privileges
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Asia/Singapore
-      - DOMAIN=i.opnxng.com
-      - USE_HELMET=true
-      - USE_HELMET_HSTS=true
-      - TRUST_PROXY=true
-      - REDIS_HOST=localhost
-#      - REDIS_HOST=teddit-redis
-      - THEME=dark
-      - FLAIRS_ENABLED=false
-      - API_ENABLED=false
-      - SUGGESTED_SUBREDDITS=["Saved", "Selfhosted", "Linux", "Privacy", "DataHoarder"]
-      - DOMAIN_REPLACEMENTS=[["quora.com","q.opnxng.com."],["imgur.com","r.opnxng.com"]]
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD", "wget" ,"--no-verbose", "--tries=1", "--spider", "http://localhost:8080/about"]
-      interval: 1m
-      timeout: 3s
-    depends_on:
-      - teddit-redis
-    logging:
-        driver: none
-    volumes:
-      - {{ docker_dir }}/teddit/topbar.pug:/teddit/views/includes/topbar.pug
-      - {{ docker_dir }}/teddit/about.pug:/teddit/views/about.pug
-    network_mode: "service:teddit-warp"
-
-  teddit-redis:
-    container_name: teddit-redis
-    image: redis:alpine
-    command: redis-server
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Asia/Singapore
-      - REDIS_REPLICATION_MODE=master
-    restart: unless-stopped
-    network_mode: "service:teddit-warp"
-
-networks:
-  teddit:
-    name: teddit

templates/conf/Caddyfile.j2

@@ -151,14 +151,14 @@
 		redir https://opnxng.com{uri}
 	}
 
+	@n host n.{$HOSTNAME}
+	handle @n {
+		redir https://about.opnxng.com/blog/#nitter
+	}
+
 	@i host i.{$HOSTNAME}
 	handle @i {
-		encode zstd gzip
+		redir https://about.opnxng.com/blog/#teddit
-		reverse_proxy {{ vultr_private_ip }}:8881
-		header {
-			Content-Security-Policy "default-src 'self';base-uri 'self';block-all-mixed-content;font-src 'self' https: data:;frame-ancestors 'self';img-src 'self' data:;object-src 'none';script-src 'self';script-src-attr 'none';style-src 'self' https: 'unsafe-inline';upgrade-insecure-requests"
-			X-Robots-Tag "noindex, noimageindex, nosnippet, notranslate, noarchive, nofollow"
-		}
 	}
 
 	@l host l.{$HOSTNAME}
@@ -181,34 +181,6 @@
 		}
 	}
 
-#	@n {
-#		host n.{$HOSTNAME}
-#		maxmind_geolocation {
-#			db_path "/etc/caddy/GeoLite2-City.mmdb"
-#			deny_countries CN
-#		}
-#	}
-#	handle @n {
-#		@notstatic {
-#			not path /css/* /js/* /fonts/* /browserconfig.xml /android-chrome* /favicon* /logo* /lp.svg /robots.txt /safari* /site.webmanifest /pic/*
-#		}
-#		rate_limit @notstatic {remote.ip} 2r/s 60000 429
-#		rate_limit @notstatic {remote.ip} 45r/m 300000 429
-#		reverse_proxy {{ oracle4_private_ip }}:8883 {
-#			header_up X-Real-IP {remote_host}
-#			transport http {compression off}
-#		}
-#		header {
-#			header Content-Security-Policy "default-src 'none'; script-src 'self' 'unsafe-inline'; img-src 'self'; style-src 'self' 'unsafe-inline'; font-src 'self'; object-src 'none'; media-src 'self' blob:; worker-src 'self' blob:; base-uri 'self'; form-action 'self'; frame-ancestors 'self'; connect-src 'self' https://*.twimg.com; manifest-src 'self'"
-#			X-Robots-Tag "noindex, noimageindex, nosnippet, notranslate, noarchive, nofollow"
-#		}
-#	}
-
-	@n host n.{$HOSTNAME}
-	handle @n {
-		redir https://about.opnxng.com/blog/#nitter
-	}
-
 	@b host b.{$HOSTNAME}
 	handle @b {
 		reverse_proxy {{ oracle1_private_ip }}:8884
@@ -557,30 +529,6 @@
 		}
 	}
 
-#	@4g host 4g.{$HOSTNAME}
-#	handle @4g {
-#		encode zstd gzip
-#		@notstatic {
-#			not path /static/* /android-chrome* /favicon* /robots.txt /banner/* /site.webmanifest
-#		}
-#		rate_limit @notstatic {remote.ip} 2r/s 60000 429
-#		rate_limit @notstatic {remote.ip} 45r/m 300000 429
-#		reverse_proxy {
-#			to {{ oracle1_private_ip }}:8907
-#			to {{ oracle2_private_ip }}:8907
-#			to {{ oracle3_private_ip }}:8907
-#			to {{ oracle4_private_ip }}:8907
-#			lb_policy ip_hash
-#			lb_try_duration 5s
-#			lb_try_interval 1s
-#			fail_duration 30s
-#			max_fails 3
-#		}
-#		header {
-#			X-Robots-Tag "noindex, noimageindex, nosnippet, notranslate, noarchive, nofollow"
-#		}
-#	}
-
 	@tb host tb.{$HOSTNAME}
 	handle @tb {
 		encode zstd gzip

vars/services.yaml

@@ -1,29 +1,16 @@
 compose:
-  oracle1:
-    - searxng
-  oracle2:
-    - searxng
-  oracle3:
-    - searxng
   oracle4:
-    - searxng
+    - caddy
 
 config:
-  oracle1:
-    - searxng
-  oracle2:
-    - searxng
-  oracle3:
-    - searxng
   oracle4:
-    - searxng
+    - caddy
 
 # ----------------------------------------------------------------------------------------------------
 
 
 deployed-compose:
   vultr:
-    - teddit
     - cloudtube
     - imgin
     - rat-aint-tieba