update

6 files changed, 71 insertions, 15 deletions

diff --git a/.newsboat/urls b/.newsboat/urls
index f0ef387..1cae29e 100644
--- a/.newsboat/urls
+++ b/.newsboat/urls
@@ -8,16 +8,16 @@ https://microservices.io/feed.xml
 https://news.ycombinator.com/rss
 
 # (Twitter)
-http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=_margery28_&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Marg"_("Twitter")
-http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=PancakeSwap&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Pancakeswap"_("Twitter")
-http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=OrchidProtocol&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~OrchidProtocol"_("Twitter")
-http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=ethereum&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Ethereum"_("Twitter")
-http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=torproject&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~TorProject"_("Twitter")
-http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=HiveBlockchain&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Hive"_("Twitter")
-http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=PrivexInc&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Privex"_("Twitter")
-http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=binance&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~binance"_("Twitter")
-http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=igor_chubin&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~igor_chubin"_("Twitter")
-http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=TheBlock__&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~the_block"_("Twitter")
+https://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=_margery28_&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Marg"_("Twitter")
+https://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=PancakeSwap&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Pancakeswap"_("Twitter")
+https://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=OrchidProtocol&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~OrchidProtocol"_("Twitter")
+https://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=ethereum&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Ethereum"_("Twitter")
+https://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=torproject&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~TorProject"_("Twitter")
+https://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=HiveBlockchain&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Hive"_("Twitter")
+https://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=PrivexInc&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Privex"_("Twitter")
+https://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=binance&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~binance"_("Twitter")
+https://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=igor_chubin&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~igor_chubin"_("Twitter")
+https://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=TheBlock__&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~the_block"_("Twitter")
 
 # (Youtube)
 # Horror
diff --git a/.zshrc b/.zshrc
index d61cf36..50ddad7 100644
--- a/.zshrc
+++ b/.zshrc
@@ -26,6 +26,7 @@ alias gd="git diff --color-words"
 # enable aliases with sudo in the alias
 alias sudo="sudo "
 alias w3m="proxychains4 -q -f ~/proxies/ice/proxychains.conf /home/devi/w3m/w3m -o auto_image=FALSE -graph"
+alias torw3m="torsocks --port 9053 /home/devi/w3m/w3m -o auto_image=FALSE -graph"
 alias rm="rm -I --one-file-system --preserve-root=all"
 alias vv="vim"
 alias ls="exa"
@@ -198,6 +199,8 @@ alias socks5vpn5="autossh -M 0 -N -D 0.0.0.0:9990 -o ServerAliveInterval=180 -o
 alias socks5vpn6="autossh -M 0 -N -D 9993 -o ServerAliveInterval=180 -o ServerAliveCountMax=3 -o ExitOnForwardFailure=yes -6 -l ubuntu -p 3333 2a07:e01:3:204::1"
 alias socks5vpn7="autossh -M 0 -N -D 9992 -o ServerAliveInterval=180 -o ServerAliveCountMax=3 -o ExitOnForwardFailure=yes -l ubuntu -p 3333 130.185.47.81"
 alias socks5vpn8="autossh -M 0 -N -D 0.0.0.0:9989 -o ServerAliveInterval=180 -o ServerAliveCountMax=3 -o ExitOnForwardFailure=yes -l ubuntu -p 3333 185.130.47.208"
+alias tormapped6="autossh -M 0 -N -L 9053:127.0.0.1:9050 -o ServerAliveInterval=180 -o ServerAliveCountMax=3 -o ExitOnForwardFailure=yes -l ubuntu -p 3333 185.130.45.46"
+alias tormapped8="autossh -M 0 -N -L 9054:127.0.0.1:9050 -o ServerAliveInterval=180 -o ServerAliveCountMax=3 -o ExitOnForwardFailure=yes -l ubuntu -p 3333 185.130.47.208"
 alias k9sskin="vim ~/scripts/.k9s/skin.yml"
 alias k9sconfig="vim ~/scripts/.k9s/config.yml"
 alias fixk9sskin="cp ~/scripts/.k9s/skin.yml ~/.config/k9s/skin.yml"
diff --git a/postit b/postit
index cd44bf8..df991aa 100644
--- a/postit
+++ b/postit
@@ -46,3 +46,4 @@ echo 1 > /proc/sys/kernel/task_delayacct
 irancell 196242684
 rust tutorial https://www.youtube.com/watch?v=ygL_xcavzQ4
 https://wms.cs.kuleuven.be/cs/studeren/master-artificial-intelligence/MAI_SIP/masters-thesis/thesis-topic-proposals
+https://www.ssllabs.com/ssltest
diff --git a/terminaldweller.com/browsh/docker-compose.yaml b/terminaldweller.com/browsh/docker-compose.yaml
index 4778988..992887e 100644
--- a/terminaldweller.com/browsh/docker-compose.yaml
+++ b/terminaldweller.com/browsh/docker-compose.yaml
@@ -5,9 +5,29 @@ services:
     networks:
       - browshnet
     ports:
-      - "4333:4333"
+      - "127.0.0.1:2333:4333"
     restart: unless-stopped
     entrypoint: "/app/bin/browsh"
     command: ["--http-server-mode"]
+    depends_on:
+      - nginx
+  nginx:
+    image: nginx:stable
+    ports:
+      - "4333:443"
+    networks:
+      - browshnet
+    restart: unless-stopped
+    cap_drop:
+      - ALL
+    cap_add:
+      - CHOWN
+      - DAC_OVERRIDE
+      - SETGID
+      - SETUID
+      - NET_BIND_SERVICE
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
+      - /etc/letsencrypt/archive/browsh.terminaldweller.com/:/certs/:ro
 networks:
   browshnet:
diff --git a/terminaldweller.com/haproxy/haproxy.cfg b/terminaldweller.com/haproxy/haproxy.cfg
index 26e90f2..c6c9ce7 100644
--- a/terminaldweller.com/haproxy/haproxy.cfg
+++ b/terminaldweller.com/haproxy/haproxy.cfg
@@ -62,8 +62,9 @@ frontend http
   http-request redirect scheme https code 301 if http git-host !letsencrypt-acl
   # http-request redirect scheme https code 301 if http rssgen-host !letsencrypt-acl
   http-request redirect scheme https code 301 if http cargo-host !letsencrypt-acl
+  http-request redirect scheme https code 301 if http browsh-host !letsencrypt-acl
   #http-request redirect scheme https code 301 if http jabber-host !letsencrypt-acl
-  # http-request redirect scheme https code 301 if http rssgen-host !letsencrypt-acl
+  http-request redirect scheme https code 301 if http rssgen-host !letsencrypt-acl
 
   #Conditions
   use_backend blog-backend-cert if letsencrypt-acl blog-host
@@ -77,6 +78,7 @@ frontend http
   use_backend searx-backend-cert if letsencrypt-acl rssgen-host
   use_backend searx-backend-cert if letsencrypt-acl git-host
   use_backend searx-backend-cert if letsencrypt-acl cargo-host
+  use_backend vpn6-cert-backend if letsencrypt-acl browsh-host
 #  use_backend editor-backend-cert if letsencrypt-acl editor-host
   use_backend certbot-backend if letsencrypt-acl !jabber-host !blog-host !api-host
   use_backend blog-backend if blog-host
@@ -110,6 +112,7 @@ frontend https
   acl editorsave-host-s req.ssl_sni -i editorsave.terminaldweller.com
   acl discord-host-s req.ssl_sni -i discord.terminaldweller.com
   acl rssgen-host-s req.ssl_sni -i rssgen.terminaldweller.com
+  acl browsh-host-s req.ssl_sni -i browsh.terminaldweller.com
   #Conditions
   use_backend mail-backend-s if mail-host-s
   #use_backend chat-backend-s if chat-host-s
@@ -124,6 +127,7 @@ frontend https
   use_backend editorsave-backend-s if editorsave-host-s
   use_backend git-backend-s if git-host-s
   use_backend rssgen-backend-s if rssgen-host-s
+  use_backend browsh-backend-s if browsh-host-s
 
 #frontend jabber5222
 #  bind *:5222
@@ -381,3 +385,11 @@ backend git-backend-s
 backend browsh-backend
   mode http
   server browsh-host 185.130.45.46:4333
+backend browsh-backend-s
+  mode tcp
+  option tcp-check
+  server browsh-host-s 185.130.45.46:4333
+
+backend vpn6-cert-backend
+  mode http
+  server vpn6-cert-host 185.130.45.46:80
diff --git a/terminaldweller.com/rss-bridge/docker-compose.yaml b/terminaldweller.com/rss-bridge/docker-compose.yaml
index 0cc8325..2dd98f4 100644
--- a/terminaldweller.com/rss-bridge/docker-compose.yaml
+++ b/terminaldweller.com/rss-bridge/docker-compose.yaml
@@ -5,12 +5,32 @@ services:
     networks:
       - rssbridgenet
     ports:
+      - "127.0.0.1:3080:80"
+    restart: unless-stopped
+    depends_on:
+      - nginx
+    # volumes:
+    #   - ./nginx.conf:/etc/nginx/nginx.conf:ro
+    #   - /etc/letsencrypt/archive/rssgen.terminaldweller.com/:/certs/:ro
+    # cap_drop:
+    #   - ALL
+  nginx:
+    image: nginx:stable
+    ports:
       - "3000:443"
+    networks:
+      - rssbridgenet
     restart: unless-stopped
+    cap_drop:
+      - ALL
+    cap_add:
+      - CHOWN
+      - DAC_OVERRIDE
+      - SETGID
+      - SETUID
+      - NET_BIND_SERVICE
     volumes:
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
-      - /etc/letsencrypt/archive/rssgen.terminaldweller.com/:/certs/:ro
-    # cap_drop:
-    #   - ALL
+      - /etc/letsencrypt/archive/browsh.terminaldweller.com/:/certs/:ro
 networks:
   rssbridgenet: