pre fuse checkpoint

backend/Dockerfile

@@ -3,7 +3,7 @@ FROM python:3.12-slim-bookworm AS builder
 
 # Second line optional/debug/qol
 RUN apt update && apt install -y \
-    libmariadb-dev gcc python3-setuptools \
+    libmariadb-dev gcc \
     mariadb-client
 
 

compose.yaml

@@ -31,7 +31,7 @@ services:
     #tty: true
     restart: always
     # Comment following line to use flask (1worker, dev), uncomment to use uwsgi (wsgi)
-    #command: ["uwsgi", "--http", "0.0.0.0:8000", "--master", "-p", "4", "-w", "microblog:app"]
+    command: ["uwsgi", "--http", "0.0.0.0:8000", "--master", "-p", "4", "-w", "microblog:app"]
     container_name: backend
     environment:
       - MYSQL_USER=flasku
@@ -99,9 +99,9 @@ services:
   proxy:
     build: proxy
     restart: always
-    #volumes:
+    volumes:
-    #  - /home/finn/d/cert/var/lib/letsencrypt:/var/lib/letsencrypt:ro
+      - /home/finn/d/cert/var/lib/letsencrypt:/var/lib/letsencrypt:ro
-    #  - /home/finn/d/cert/etc/letsencrypt:/etc/letsencrypt:ro
+      - /home/finn/d/cert/etc/letsencrypt:/etc/letsencrypt:ro
     ports:
       - "80:80"
       - "443:443"
@@ -121,11 +121,11 @@ services:
       - frontnet
  
   pmb:
-    build:
+    #build:
-      args:
+    #  args:
-        GPG_PP: $BUILD_GPG_PP
+    #    GPG_PP: $BUILD_GPG_PP
-      context: pmb-pf
+    #  context: pmb-pf
-      dockerfile: Dockerfile
+    #  dockerfile: Dockerfile
     image: site_pmb:latest
     expose:
       - "25"
@@ -152,37 +152,9 @@ services:
     networks:
       - frontnet
 
-  nextcloud:
-    image: nextcloud:latest
-    restart: always
-    container_name: nextcloud
-    volumes:
-      - nextcloud-data:/var/www/html
-      - nextcloud-apps:/var/www/html/custom_apps
-      - nextcloud-config:/var/www/html/config
-      - nextcloud-data:/var/www/html/data
-    environment:
-      - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.oily.dad
-      - MYSQL_HOST=db
-      - MYSQL_DATABASE=nextcloud
-      - MYSQL_USER=nextcloud
-      - MYSQL_PASSWORD=${DOTENV_MYSQL_NEXTCLOUD_PASSWORD}
-      - NEXTCLOUD_ADMIN_USER=admin
-      - NEXTCLOUD_ADMIN_PASSWORD=${DOTENV_NEXTCLOUD_ADMIN_PASSWORD}
-      - NEXTCLOUD_DATA_DIR=/var/www/html/data
-    networks:
-      - backnet
-      - frontnet
-    depends_on:
-      db:
-        condition: service_healthy
-
 volumes:
   db-data:
   pmb-root:
-  nextcloud-data:
-  nextcloud-apps:
-  nextcloud-config:
 
 networks:
   backnet:

compose.yaml.local

@@ -81,7 +81,7 @@ services:
       - GITEA__server__LANDING_PAGE=explore
       - GITEA__ui__REACTIONS="+1, -1, fu, heart, laugh, confused, hooray, eyes, gun, boom, poop, kiss, rocket, bomb, chart_with_downwards_trend, eggplant"
       # To disable new users after setup:
-      - GITEA__service__DISABLE_REGISTRATION=true
+      - GITEA__service__DISABLE_REGISTRATION=false
     networks:
       - backnet
       - frontnet
@@ -121,11 +121,11 @@ services:
       - frontnet
  
   pmb:
-    build:
+    #build:
-      args:
+    #  args:
-        GPG_PP: $BUILD_GPG_PP
+    #    GPG_PP: $BUILD_GPG_PP
-      context: pmb-pf
+    #  context: pmb-pf
-      dockerfile: Dockerfile
+    #  dockerfile: Dockerfile
     image: site_pmb:latest
     expose:
       - "25"
@@ -152,37 +152,9 @@ services:
     networks:
       - frontnet
 
-  nextcloud:
-    image: nextcloud:latest
-    restart: always
-    container_name: nextcloud
-    volumes:
-      - nextcloud-data:/var/www/html
-      - nextcloud-apps:/var/www/html/custom_apps
-      - nextcloud-config:/var/www/html/config
-      - nextcloud-data:/var/www/html/data
-    environment:
-      - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.oily.dad
-      - MYSQL_HOST=db
-      - MYSQL_DATABASE=nextcloud
-      - MYSQL_USER=nextcloud
-      - MYSQL_PASSWORD=${DOTENV_MYSQL_NEXTCLOUD_PASSWORD}
-      - NEXTCLOUD_ADMIN_USER=admin
-      - NEXTCLOUD_ADMIN_PASSWORD=${DOTENV_NEXTCLOUD_ADMIN_PASSWORD}
-      - NEXTCLOUD_DATA_DIR=/var/www/html/data
-    networks:
-      - backnet
-      - frontnet
-    depends_on:
-      db:
-        condition: service_healthy
-
 volumes:
   db-data:
   pmb-root:
-  nextcloud-data:
-  nextcloud-apps:
-  nextcloud-config:
 
 networks:
   backnet:

compose.yaml.prod

@@ -81,7 +81,7 @@ services:
       - GITEA__server__LANDING_PAGE=explore
       - GITEA__ui__REACTIONS="+1, -1, fu, heart, laugh, confused, hooray, eyes, gun, boom, poop, kiss, rocket, bomb, chart_with_downwards_trend, eggplant"
       # To disable new users after setup:
-      - GITEA__service__DISABLE_REGISTRATION=true
+      - GITEA__service__DISABLE_REGISTRATION=false
     networks:
       - backnet
       - frontnet
@@ -121,11 +121,11 @@ services:
       - frontnet
  
   pmb:
-    build:
+    #build:
-      args:
+    #  args:
-        GPG_PP: $BUILD_GPG_PP
+    #    GPG_PP: $BUILD_GPG_PP
-      context: pmb-pf
+    #  context: pmb-pf
-      dockerfile: Dockerfile
+    #  dockerfile: Dockerfile
     image: site_pmb:latest
     expose:
       - "25"
@@ -152,37 +152,9 @@ services:
     networks:
       - frontnet
 
-  nextcloud:
-    image: nextcloud:latest
-    restart: always
-    container_name: nextcloud
-    volumes:
-      - nextcloud-data:/var/www/html
-      - nextcloud-apps:/var/www/html/custom_apps
-      - nextcloud-config:/var/www/html/config
-      - nextcloud-data:/var/www/html/data
-    environment:
-      - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.oily.dad
-      - MYSQL_HOST=db
-      - MYSQL_DATABASE=nextcloud
-      - MYSQL_USER=nextcloud
-      - MYSQL_PASSWORD=${DOTENV_MYSQL_NEXTCLOUD_PASSWORD}
-      - NEXTCLOUD_ADMIN_USER=admin
-      - NEXTCLOUD_ADMIN_PASSWORD=${DOTENV_NEXTCLOUD_ADMIN_PASSWORD}
-      - NEXTCLOUD_DATA_DIR=/var/www/html/data
-    networks:
-      - backnet
-      - frontnet
-    depends_on:
-      db:
-        condition: service_healthy
-
 volumes:
   db-data:
   pmb-root:
-  nextcloud-data:
-  nextcloud-apps:
-  nextcloud-config:
 
 networks:
   backnet:

db/init/01-databases.sql

@@ -1,15 +1,12 @@
 -- create databases
 CREATE DATABASE IF NOT EXISTS `gitea`;
 CREATE DATABASE IF NOT EXISTS `flask`;
-CREATE DATABASE IF NOT EXISTS `nextcloud`;
 
 -- create root user and grant rights
-CREATE USER IF NOT EXISTS 'gitea'@'gitea.backnet' IDENTIFIED BY 'giteap';
+CREATE USER 'gitea'@'gitea.backnet' IDENTIFIED BY 'giteap';
-CREATE USER IF NOT EXISTS 'flasku'@'backend.backnet' IDENTIFIED BY 'flaskp';
+CREATE USER 'flasku'@'backend.backnet' IDENTIFIED BY 'flaskp';
-CREATE USER IF NOT EXISTS 'nextcloud'@'nextcloud.backnet' IDENTIFIED BY 'nextcloudp';
 --CREATE USER 'gitea'@'localhost' IDENTIFIED BY 'gitea';
 --GRANT ALL ON `gitea` TO 'gitea'@'localhost';
 GRANT ALL ON gitea.* TO 'gitea'@'gitea.backnet';
 GRANT ALL ON flask.* TO 'flasku'@'backend.backnet';
-GRANT ALL ON nextcloud.* TO 'nextcloud'@'nextcloud.backnet';
 

dotenv

@@ -31,8 +31,4 @@ FLASK_ADMIN_EMAIL="git@aaa"
 FLASK_JWT_PHRASE="jwtphrase"
 FLASK_REAL_HOSTNAME="localhost"
 
-# Nextcloud:
-DOTENV_MYSQL_NEXTCLOUD_PASSWORD="nextcloudp"
-DOTENV_NEXTCLOUD_ADMIN_PASSWORD="adminp"
-
 

ls_rclone.sh

@@ -0,0 +1,5 @@
+rclone ls :sftp: \
+  --sftp-host=localhost \
+  --sftp-port=11111 \
+  --sftp-user=armbian \
+  --sftp-key-file=/home/armbian/.ssh/armbian-brie-202604

proxy/Caddyfile

@@ -0,0 +1,52 @@
+# Global options
+{
+	# Disable auto HTTPS since we're using existing certificates
+	auto_https off
+}
+
+# HTTP to HTTPS redirect
+:80 {
+	redir https://{host}{uri} permanent
+}
+
+# Main domain - oily.dad and www.oily.dad
+oily.dad, www.oily.dad {
+	# Root directory (not strictly needed for reverse proxy)
+	root * /var/www/html
+
+	# Use existing SSL certificates
+	tls /etc/letsencrypt/live/oily.dad/fullchain.pem /etc/letsencrypt/live/oily.dad/privkey.pem
+
+	# Onion-Location header
+	header Onion-Location http://oilydada7ckiseinkbeathsefwgkvjrce743xy7x7iiybkuxh4vheead.onion{path}
+
+	# Reverse proxy to backend
+	reverse_proxy http://backend:8000 {
+		# Preserve original host header
+		header_up Host {host}
+		header_up X-Real-IP {remote}
+		# X-Forwarded-For and X-Forwarded-Proto are set automatically by Caddy
+	}
+}
+
+# Subdomain for Gitea - gut.oily.dad
+gut.oily.dad {
+	# Root directory (not strictly needed for reverse proxy)
+	root * /var/www/html
+
+	# Use existing SSL certificates
+	tls /etc/letsencrypt/live/oily.dad/fullchain.pem /etc/letsencrypt/live/oily.dad/privkey.pem
+
+	# Reverse proxy to Gitea
+	reverse_proxy http://gitea:3000 {
+		# WebSocket support for Gitea
+		header_up Connection {>Connection}
+		header_up Upgrade {>Upgrade}
+
+		# Preserve original headers
+		header_up Host {host}
+		header_up X-Real-IP {remote}
+		# X-Forwarded-For and X-Forwarded-Proto are set automatically by Caddy
+	}
+}
+

proxy/Dockerfile

@@ -1,2 +1,10 @@
-FROM nginx:alpine
+FROM caddy:alpine
-COPY conf /etc/nginx/conf.d/default.conf
+
+# Copy Caddyfile configuration
+COPY Caddyfile /etc/caddy/Caddyfile
+
+# Create directory for www root
+RUN mkdir -p /var/www/html
+
+# Caddy runs as non-root user by default
+# Ports 80 and 443 are exposed by the base image

proxy/baseconf

@@ -1,20 +0,0 @@
-server {
-    listen       80;
-    server_name  localhost;
-    location / {
-        proxy_pass   http://backend:8000;
-    }
-    location /gutty{
-        proxy_pass   http://gitea:3000;
-    }
-    location /nextcloud{
-        client_max_body_size 512M;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_pass   http://nextcloud/;
-    }
-
-
-}

proxy/conf

@@ -1,20 +0,0 @@
-server {
-    listen       80;
-    server_name  localhost;
-    location / {
-        proxy_pass   http://backend:8000;
-    }
-    location /gutty{
-        proxy_pass   http://gitea:3000;
-    }
-    location /nextcloud{
-        client_max_body_size 512M;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_pass   http://nextcloud/;
-    }
-
-
-}

proxy/giteaconf

@@ -1,17 +0,0 @@
-server {
-
-    listen       80;
-    server_name  localhost;
-
-    location / {
-        client_max_body_size 512M;
-        #proxy_pass http://localhost:3000;
-        proxy_pass http://gitea:3000;
-        proxy_set_header Connection $http_connection;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-} 

proxy/sslconf

@@ -1,72 +0,0 @@
-#server {
-#    listen       80;
-#    server_name  localhost;
-#    location / {
-#        proxy_pass   http://backend:8000;
-#    }
-
-
-# always redirect to https
-server {
-	listen 80 default_server;
-	server_name _;
-	return 301 https://$host$request_uri;
-}
-
-server {
-	listen 443 ssl http2;
-	# use the certificates
-	ssl_certificate /etc/letsencrypt/live/oily.dad/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/oily.dad/privkey.pem;
-	server_name oily.dad www.oily.dad;
-	root /var/www/html;
-	index index.php index.html index.htm;
-
-	add_header Onion-Location http://oilydada7ckiseinkbeathsefwgkvjrce743xy7x7iiybkuxh4vheead.onion$request_uri;
-
-	location / {
-		proxy_pass http://backend:8000/;
-	}
-}
-
-server {
-	listen 443 ssl http2;
-	# use the certificates
-	ssl_certificate /etc/letsencrypt/live/oily.dad/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/oily.dad/privkey.pem;
-	server_name gut.oily.dad;
-	root /var/www/html;
-	index index.php index.html index.htm;
-
-	location / {
-		client_max_body_size 512M;
-	        #proxy_pass http://localhost:3000;
-	        proxy_set_header Connection $http_connection;
-        	proxy_set_header Upgrade $http_upgrade;
-	        proxy_set_header Host $host;
-	        proxy_set_header X-Real-IP $remote_addr;
-	        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-	        proxy_set_header X-Forwarded-Proto $scheme;
-		proxy_pass http://gitea:3000/;
-	}
-}
-
-server {
-	listen 443 ssl http2;
-	# use the certificates
-	ssl_certificate /etc/letsencrypt/live/oily.dad/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/oily.dad/privkey.pem;
-	server_name nextcloud.oily.dad;
-	root /var/www/html;
-	index index.php index.html index.htm;
-
-	location / {
-		client_max_body_size 512M;
-		proxy_set_header Host $host;
-		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header X-Forwarded-Proto $scheme;
-		proxy_pass http://nextcloud/;
-	}
-}
-

sshtun/Dockerfile

@@ -1,15 +1,20 @@
-FROM debian:12-slim
+FROM debian:13-slim
 
-RUN apt update && apt install -y openssh-server socat
+RUN apt update
+RUN apt install -y \
+	openssh-server \
+	socat
 
-RUN adduser --disabled-password --gecos "" finn
+RUN adduser --disabled-password --gecos "" armbian
 
-RUN mkdir /home/finn/.ssh
+# ssh:
-
+RUN mkdir /home/armbian/.ssh
-# only one pubkey -- wildcard to conceal filename
+# only one pubkey -- wildcard just to conceal filename
-COPY ./oilykey/*.pub /home/finn/.ssh/authorized_keys
+COPY ./oilykey/*.pub /home/armbian/.ssh/authorized_keys
-
+COPY ./oilykey/* /home/armbian/.ssh/
-RUN mkdir /var/run/sshd
+RUN chown -R armbian:armbian /home/armbian/.ssh/
+RUN chmod 600 /home/armbian/.ssh/*
+#RUN mkdir /var/run/sshd
 RUN echo "PermitRootLogin no" >> /etc/ssh/sshd_config
 RUN echo "PasswordAuthentication no" >> /etc/ssh/sshd_config
 

sshtun/manual_rclone.sh

@@ -0,0 +1,8 @@
+rclone mount :sftp: /armbian/briemount \
+  --sftp-host=localhost \
+  --sftp-port=11111 \
+  --sftp-user=armbian \
+  --sftp-key-file=/home/armbian/.ssh/armbian-brie-202604 \
+  --vfs-cache-mode off \
+  --allow-other \
+  --daemon