.gitignore

@@ -1,8 +1,7 @@
-gitea
+gitea/
 .env
-pmb-pf
+pmb-pf/
 venv
 zapp.db
 db/bu
-tor/hidden_service
+tor/hidden_service/
-sshtun/oilykey

compose.yaml

@@ -100,8 +100,8 @@ services:
       - /home/finn/d/cert/var/lib/letsencrypt:/var/lib/letsencrypt:ro
       - /home/finn/d/cert/etc/letsencrypt:/etc/letsencrypt:ro
     ports:
-      - "80:80"
+      - 80:80
-      - "443:443"
+      - 443:443
     depends_on: 
       - backend
     networks:
@@ -135,19 +135,6 @@ services:
     networks:
       - backnet
 
-  sshtun:
-    build:
-      context: sshtun
-      dockerfile: Dockerfile
-    restart: always
-    ports:
-      - "22222:22"
-    expose:
-      - "11111"
-      - "11112"
-    networks:
-      - frontnet
-
 volumes:
   db-data:
   pmb-root:

compose.yaml.local

@@ -100,8 +100,8 @@ services:
     #  - /home/finn/d/cert/var/lib/letsencrypt:/var/lib/letsencrypt:ro
     #  - /home/finn/d/cert/etc/letsencrypt:/etc/letsencrypt:ro
     ports:
-      - "80:80"
+      - 80:80
-      - "443:443"
+      - 443:443
     depends_on: 
       - backend
     networks:
@@ -135,19 +135,6 @@ services:
     networks:
       - backnet
 
-  sshtun:
-    build:
-      context: sshtun
-      dockerfile: Dockerfile
-    restart: always
-    ports:
-      - "22222:22"
-    expose:
-      - "11111"
-      - "11112"
-    networks:
-      - frontnet
-
 volumes:
   db-data:
   pmb-root:

compose.yaml.prod

@@ -100,8 +100,8 @@ services:
       - /home/finn/d/cert/var/lib/letsencrypt:/var/lib/letsencrypt:ro
       - /home/finn/d/cert/etc/letsencrypt:/etc/letsencrypt:ro
     ports:
-      - "80:80"
+      - 80:80
-      - "443:443"
+      - 443:443
     depends_on: 
       - backend
     networks:
@@ -135,19 +135,6 @@ services:
     networks:
       - backnet
 
-  sshtun:
-    build:
-      context: sshtun
-      dockerfile: Dockerfile
-    restart: always
-    ports:
-      - "22222:22"
-    expose:
-      - "11111"
-      - "11112"
-    networks:
-      - frontnet
-
 volumes:
   db-data:
   pmb-root:

sshtun/Dockerfile

@@ -1,18 +0,0 @@
-FROM debian:12-slim
-
-RUN apt update && apt install -y openssh-server socat
-
-RUN adduser --disabled-password --gecos "" finn
-
-RUN mkdir /home/finn/.ssh
-
-# only one pubkey -- wildcard to conceal filename
-COPY ./oilykey/*.pub /home/finn/.ssh/authorized_keys
-
-RUN mkdir /var/run/sshd
-RUN echo "PermitRootLogin no" >> /etc/ssh/sshd_config
-RUN echo "PasswordAuthentication no" >> /etc/ssh/sshd_config
-
-COPY ./entrypoint.sh /
-
-ENTRYPOINT ["/entrypoint.sh"]

sshtun/entrypoint.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-# Container goal:
-# autossh -N -R 11111:localhost:11434 -i sshtun/oilykey/<SOMEKEY> -p 22222 <SOMEURL>
-# forwards    rem_c_port:(operator_pc:op_pc_port) ...some args...  rem_host_p rem_host_url 
-
-nohup socat TCP-LISTEN:11112,fork TCP:localhost:11111 &
-/usr/sbin/sshd -D
-