fix py3 back compat failure

Reviewed-on: finn/site#7
Massive.

backend/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.4
-FROM python:3-slim-bookworm AS builder
+FROM python:3.12-slim-bookworm AS builder
 
 # Second line optional/debug/qol
 RUN apt update && apt install -y \

backend/app/forms.py

@@ -7,7 +7,7 @@ from app.models import User
 
 class LoginForm(FlaskForm):
     username = StringField('Username', validators=[DataRequired()])
-    password = PasswordField('Pasword', validators=[DataRequired()])
+    password = PasswordField('Password', validators=[DataRequired()])
     remember_me = BooleanField('Remember Me')
     submit = SubmitField('Sign In')
 

backend/app/static/test.txt

@@ -0,0 +1 @@
+eee

backend/app/templates/base.html

@@ -19,10 +19,12 @@
       <a {% block profilecurrent %}{% endblock %} href="{{ url_for('user', username=current_user.username) }}">profile</a>
       <a href="{{ url_for('logout') }}">logout</a>
       {% endif %}
-
+      <a href="https://gut.oily.dad/explore/repos">
+        <img style="vertical-align: middle; horizontal-align: center; height: 22px" src="https://gut.oily.dad/assets/img/logo.svg" alt="Logo" aria-hidden="true">
+      </a>
     </nav>
+
     <h2>oily.dad</h2>
-		<h5>oilydada7ckiseinkbeathsefwgkvjrce743xy7x7iiybkuxh4vheead.onion</h5>
     </header>
     <hr>
     {% with messages = get_flashed_messages() %}

compose.yaml

@@ -75,10 +75,13 @@ services:
       - GITEA__mailer__PROTOCOL=smtp
       - GITEA__mailer__SMTP_ADDR=pmb
       - GITEA__mailer__SMTP_PORT=25
-      - GITEA__service__REGISTER_EMAIL_CONFIRM=true
+      - GITEA__service__REGISTER_EMAIL_CONFIRM=false
+      - GITEA__service__REGISTER_MANUAL_CONFIRM=true
       - GITEA__service__ENABLE_NOTIFY_MAIL=true
+      - 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=false
+      - GITEA__service__DISABLE_REGISTRATION=true
     networks:
       - backnet
       - frontnet
@@ -139,11 +142,12 @@ services:
     build:
       context: sshtun
       dockerfile: Dockerfile
-    restart: always
+    restart: on-failure
+    environment:
+      - USE_TUN=${USE_TUN}
     ports:
       - "22222:22"
     expose:
-      - "11111"
       - "11112"
     networks:
       - frontnet

compose.yaml.local

@@ -75,10 +75,13 @@ services:
       - GITEA__mailer__PROTOCOL=smtp
       - GITEA__mailer__SMTP_ADDR=pmb
       - GITEA__mailer__SMTP_PORT=25
-      - GITEA__service__REGISTER_EMAIL_CONFIRM=true
+      - GITEA__service__REGISTER_EMAIL_CONFIRM=false
+      - GITEA__service__REGISTER_MANUAL_CONFIRM=true
       - GITEA__service__ENABLE_NOTIFY_MAIL=true
+      - 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=false
+      - GITEA__service__DISABLE_REGISTRATION=false
     networks:
       - backnet
       - frontnet
@@ -139,11 +142,12 @@ services:
     build:
       context: sshtun
       dockerfile: Dockerfile
-    restart: always
+    restart: on-failure
+    environment:
+      - USE_TUN=${USE_TUN}
     ports:
       - "22222:22"
     expose:
-      - "11111"
       - "11112"
     networks:
       - frontnet

compose.yaml.prod

@@ -75,10 +75,13 @@ services:
       - GITEA__mailer__PROTOCOL=smtp
       - GITEA__mailer__SMTP_ADDR=pmb
       - GITEA__mailer__SMTP_PORT=25
-      - GITEA__service__REGISTER_EMAIL_CONFIRM=true
+      - GITEA__service__REGISTER_EMAIL_CONFIRM=false
+      - GITEA__service__REGISTER_MANUAL_CONFIRM=true
       - GITEA__service__ENABLE_NOTIFY_MAIL=true
+      - 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=false
+      - GITEA__service__DISABLE_REGISTRATION=false
     networks:
       - backnet
       - frontnet
@@ -139,11 +142,12 @@ services:
     build:
       context: sshtun
       dockerfile: Dockerfile
-    restart: always
+    restart: on-failure
+    environment:
+      - USE_TUN=${USE_TUN}
     ports:
       - "22222:22"
     expose:
-      - "11111"
       - "11112"
     networks:
       - frontnet

dotenv

@@ -13,6 +13,9 @@ BUILD_GPG_PP=
 # Tor:
 # true/false:
 USE_TOR=false
+# SSH Tun:
+# true/false:
+USE_TUN=false
 
 # Backend:
 FLASK_SECRET_KEY="flaskkey"

proxy/conf

@@ -22,6 +22,7 @@ server {
 	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/;

proxy/sslconf

@@ -22,6 +22,7 @@ server {
 	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/;

sshtun/entrypoint.sh

@@ -1,8 +1,14 @@
 #!/bin/bash
-# Container goal:
+# Container goal: egress
-# autossh -N -R 11111:localhost:11434 -i sshtun/oilykey/<SOMEKEY> -p 22222 <SOMEURL>
+# first:	physical_box$ autossh -N -R 11111:localhost:11434 -i sshtun/oilykey/<SOMEKEY> -p 22222 <rem_vps_url>
-# forwards    rem_c_port:(operator_pc:op_pc_port) ...some args...  rem_host_p rem_host_url 
+# will forward rem_c_port:physical_box:physical_box_port ...some args...  rem_vps_p rem_vps_url
+# then:		frontnet_c$ curl sshtun.frontnet:11112 --> physical_box:11434
 
-nohup socat TCP-LISTEN:11112,fork TCP:localhost:11111 &
+if $USE_TUN ; then
-/usr/sbin/sshd -D
+	echo "@@@@@@@@@@ SSH TUNNEL ENABLED BY ENV"
+	nohup socat TCP-LISTEN:11112,fork TCP:localhost:11111 &
+	/usr/sbin/sshd -De
+else
+	echo "@@@@@@@@@@ SSH TUNNEL DISABLED BY ENV"
+fi