recenter gitea link

Reviewed-on: finn/site#5

.gitignore

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

backend/app/email.py

@@ -18,7 +18,7 @@ def send_email(subject, sender, recipients, text_body, html_body):
 def send_password_reset_email(user):
     token = user.get_reset_password_token()
     hostname = app.config['REAL_HOSTNAME']
-    send_email('[Blog] Reset Password',
+    send_email('reset oily password',
                sender=app.config['ADMINS'][0],
                recipients=[user.email],
                text_body=render_template('email/reset_password.txt', hostname=hostname, user=user, token=token),

backend/app/forms.py

@@ -51,7 +51,7 @@ class ResetPasswordRequestForm(FlaskForm):
     submit = SubmitField('Request Password Reset')
 
 class PostForm(FlaskForm):
-    post = TextAreaField('Post:', validators=[DataRequired(), Length(min=1, max=140)])
+    post = TextAreaField('Post', validators=[DataRequired(), Length(min=1, max=140)])
     submit = SubmitField('Submit')
 
 class EmptyForm(FlaskForm):

backend/app/models.py

@@ -66,7 +66,7 @@ class User(UserMixin, db.Model):
                       '#5000FF',
                       '#FF0030']
                       
-        background = '#151515'
+        background = '#030303'
 
         digest = hashlib.md5(self.email.lower().encode('utf-8')).hexdigest()
         basedir = os.path.abspath(os.path.dirname(__file__))

backend/app/routes.py

@@ -37,18 +37,19 @@ def index():
     next_url = url_for('index', page=posts.next_num) if posts.has_next else None
     prev_url = url_for('index', page=posts.prev_num) if posts.has_prev else None
 
-    return render_template('index.html', title='Home', form=form, posts=posts.items, next_url=next_url, prev_url=prev_url)
+    return render_template('index.html', title='oily home', form=form, posts=posts.items, next_url=next_url, prev_url=prev_url)
 
 @app.route('/explore')
 @login_required
 def explore():
     query = sa.select(Post).order_by(Post.timestamp.desc())
     page = request.args.get('page', 1, type=int)
-    posts = db.paginate(query, page=page, per_page=app.config['POSTS_PER_PAGE'], error_out=False)
+    ppp = app.config['POSTS_PER_PAGE'] * 2
+    posts = db.paginate(query, page=page, per_page=ppp, error_out=False)
     next_url = url_for('explore', page=posts.next_num) if posts.has_next else None
     prev_url = url_for('explore', page=posts.prev_num) if posts.has_prev else None
 
-    return render_template('explore.html', title='Explore', posts=posts.items, next_url=next_url, prev_url=prev_url)
+    return render_template('explore.html', title='oily explore', posts=posts.items, next_url=next_url, prev_url=prev_url)
 
 @app.route('/login', methods=['GET', 'POST'])
 def login():
@@ -65,7 +66,7 @@ def login():
         if not next_page or urlsplit(next_page).netloc != '':
             next_page = url_for('index')
         return redirect(next_page)    
-    return render_template('login.html', title='Sign In', form=form)
+    return render_template('login.html', title='oily sign in', form=form)
 
 @app.route('/logout')
 def logout():
@@ -76,6 +77,9 @@ def logout():
 def register():
     if current_user.is_authenticated:
         return redirect(url_for('index'))
+    if not app.config['ALLOW_REGISTRATION'] == "true":
+        flash('Registration temporarily disabled.')
+        return redirect(url_for('login'))
     form = RegistrationForm()
     if form.validate_on_submit():
         user = User(username=form.username.data, email=form.email.data)
@@ -85,7 +89,7 @@ def register():
         #user.gen_avatar()
         flash('User has been created.')
         return redirect(url_for('login'))
-    return render_template('register.html', title='Register', form=form)
+    return render_template('register.html', title='oily register', form=form)
 
 @app.route('/reset_password/<token>', methods=['GET', 'POST'])
 def reset_password(token):
@@ -107,6 +111,7 @@ def reset_password(token):
 @login_required
 def user(username):
     user = db.first_or_404(sa.select(User).where(User.username == username))
+    shortname = (current_user.username[:10] + '...') if len(current_user.username) > 14 else current_user.username
     page = request.args.get('page', 1, type=int)
     query = user.posts.select().order_by(Post.timestamp.desc())
     posts = db.paginate(query, page=page, per_page=app.config['POSTS_PER_PAGE'], error_out=False)
@@ -114,12 +119,13 @@ def user(username):
     prev_url = url_for('user', username=user.username, page=posts.prev_num) if posts.has_prev else None
 
     form = EmptyForm()
-    return render_template('user.html', user=user, posts=posts.items, next_url=next_url, prev_url=prev_url, form=form)
+    return render_template('user.html', title='oily profile - '+shortname, user=user, posts=posts.items, next_url=next_url, prev_url=prev_url, form=form)
 
 @app.route('/edit_profile', methods=['GET', 'POST'])
 @login_required
 def edit_profile():
     form = EditProfileForm(current_user.username)
+    shortname = (current_user.username[:10] + '...') if len(current_user.username) > 14 else current_user.username
     if form.validate_on_submit():
         current_user.username = form.username.data
         current_user.about_me = form.about_me.data
@@ -129,7 +135,7 @@ def edit_profile():
     elif request.method == 'GET':
         form.username.data = current_user.username
         form.about_me.data = current_user.about_me
-    return render_template('edit_profile.html', title='Edit Profile', form=form)
+    return render_template('edit_profile.html', title='oily edit profile - '+shortname, form=form)
 
 @app.route('/follow/<username>', methods=['POST'])
 @login_required
@@ -180,6 +186,6 @@ def reset_password_request():
             send_password_reset_email(user)
         flash('Password reset sent.')
         return redirect(url_for('login'))
-    return render_template('reset_password_request.html', title='Reset Password', form=form)
+    return render_template('reset_password_request.html', title='oily password reset', form=form)
 
 

backend/app/templates/404.html

@@ -2,7 +2,7 @@
 
 {% block content %}
 
-	<h1>File Not Found</h1>
+  <h2>File Not Found</h1>
   <p><a href="{{ url_for('index') }}">Back</a></p>
 
 {% endblock %}

backend/app/templates/500.html

@@ -2,7 +2,7 @@
 
 {% block content %}
 
-	<h1>An unexpected error has occurred.</h1>
+  <h2>An unexpected error has occurred.</h1>
   <p>Administrator has been notified.</p>
   <p><a href="{{ url_for('index') }}">Back</a></p>
 

backend/app/templates/_post.html

@@ -1,13 +1,11 @@
-	<table>
     <tr style="vertical-align: top;">
       <td style="vertical-align: middle; width: 60px;">
         <img style="vertical-align: middle; width: 40px;" src="data:image/png;base64,{{ post.author.gen_avatar(write_png=False) }}">
       </td>
-			<td>
+      <td style="word-break: break-word;">
         <a href="{{ url_for('user', username=post.author.username) }}">
           {{ post.author.username }}
         </a> says:<br>
         {{ post.body }}
       </td>
     </tr>
-	</table>

backend/app/templates/_postnav.html

@@ -0,0 +1,14 @@
+  <div>
+  {% if prev_url %}
+  <a class="button" href="{{ prev_url }}">Newer</a>
+  {% else %}
+  <a class="button" aria-disabled=true>Newer</a>
+  {% endif %}
+
+  {% if next_url %}
+  <a class="button" href="{{ next_url }}">Older</a>
+  {% else %}
+  <a class="button" aria-disabled=true>Older</a>
+  {% endif %}
+  </div>
+

backend/app/templates/base.html

@@ -3,9 +3,9 @@
   <head>
     <link rel="stylesheet" href="{{ url_for('static', filename='simple.css') }}">
     {% if title %}
-		<title>{{ title }} - blogpage</title>
+    <title>{{ title }}</title>
     {% else %}
-		<title>Welcome to blog.</title>
+    <title>oily page</title>
     {% endif %}
   </head>
   <body>
@@ -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>
-		<h1>oily.dad</h1>
-		<h4>destroy me</h4>
+
+    <h2>oily.dad</h2>
     </header>
     <hr>
     {% with messages = get_flashed_messages() %}

backend/app/templates/edit_profile.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-	<h1>Edit Profile</h1>
+  <h2>Edit Profile</h1>
   <form action="" method="post">
     {{ form.hidden_tag() }}
     <p>

backend/app/templates/explore.html

@@ -3,7 +3,6 @@
 {% block explorecurrent %}class="current"{% endblock %}
 
 {% block content %}
-	<h1>Hello, {{ current_user.username }}!</h1>
   {% if form %}
   <form action="" method="post">
     {{ form.hidden_tag() }}
@@ -17,11 +16,13 @@
     <p>{{ form.submit() }}</p>
   </form>
   {% endif %}
+  <table>
   {% for post in posts %}
     {% include '_post.html' %}
   {% endfor %}
-	{% if prev_url %}<a href="{{ prev_url }}">Newer Posts</a>{% endif %}
-	{% if next_url %}<a href="{{ next_url }}">Older Posts</a>{% endif %}
+  </table>
+
+  {% include '_postnav.html' %}
 
 {% endblock %}
 

backend/app/templates/index.html

@@ -3,7 +3,6 @@
 {% block indexcurrent %}class="current"{% endblock %}
 
 {% block content %}
-	<h1>Hello, {{ current_user.username }}!</h1>
   {% if form %}
   <form action="" method="post">
     {{ form.hidden_tag() }}
@@ -17,11 +16,13 @@
     <p>{{ form.submit() }}</p>
   </form>
   {% endif %}
+  <table>
   {% for post in posts %}
     {% include '_post.html' %}
   {% endfor %}
-	{% if prev_url %}<a href="{{ prev_url }}">Newer Posts</a>{% endif %}
-	{% if next_url %}<a href="{{ next_url }}">Older Posts</a>{% endif %}
+  </table>
+
+  {% include '_postnav.html' %}
 
 {% endblock %}
 

backend/app/templates/login.html

@@ -3,7 +3,7 @@
 {% block logincurrent %}class="current"{% endblock %}
 
 {% block content %}
-	<h1>Sign In</h1>
+  <h2>Sign In</h1>
   <form action="" method="post" novalidate>
     {{ form.hidden_tag() }}
     <p>

backend/app/templates/register.html

@@ -2,7 +2,7 @@
 
 {% block content %}
 
-	<h1>Register</h1>
+  <h2>Register</h1>
   <form action="" method="post">
     {{ form.hidden_tag() }}
     <p>

backend/app/templates/reset_password.html

@@ -2,7 +2,7 @@
 
 {% block content %}
 
-	<h1>Reset Your Password</h1>
+  <h2>Reset Your Password</h1>
   <form action="" method="post">
     {{ form.hidden_tag() }}
     <p>

backend/app/templates/reset_password_request.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-	<h1>Reset Password</h1>
+  <h2>Reset Password</h1>
   <form action="" method="post">
     {{ form.hidden_tag() }}
     <p>

backend/app/templates/user.html

@@ -3,19 +3,15 @@
 {% block profilecurrent %}class="current"{% endblock %}
 
 {% block content %}
-	<table>
-		<tr valign="top">
-			<td style="vertical-align: middle; text-align: center;">
-				<img style="vertical-align: middle;" src="data:image/png;base64,{{ user.gen_avatar(write_png=False) }}">
-			</td>
-			<td>
-				<h1>User: {{ user.username }}</h1>
-				<h1>CUdebug: {{ current_user }}</h1>
-				<h1>Udebug: {{ user }}</h1>
+  <article>
+    <h2>
+      <img style="vertical-align: middle; width: 60px;" src="data:image/png;base64,{{ user.gen_avatar(write_png=False) }}">
+      User: {{ user.username }}
+    </h2>
     {% if user.about_me %}<p>{{ user.about_me }}</p>{% endif %}
     {% if user.last_seen %}<p>Last activity: {{ user.last_seen }}</p>{% endif %}
     {% if user == current_user %}
-				<p><a href="{{ url_for('edit_profile') }}">Edit Profile</a></p>
+    <p><a class="button" href="{{ url_for('edit_profile') }}">Edit Profile</a></p>
     {% elif not current_user.is_following(user) %}
     <p>
       <form action="{{ url_for('follow', username=user.username) }}" method="post">
@@ -31,17 +27,16 @@
       </form>
     </p>
     {% endif %}
-
-
-			</td>
-		</tr>
-	</table>
+  </article>
   <hr>
+
+  <table>
   {% for post in posts %}
     {% include '_post.html' %}
   {% endfor %}
-	{% if prev_url %}<a href="{{ prev_url }}">Newer Posts</a>{% endif %}
-	{% if next_url %}<a href="{{ next_url }}">Older Posts</a>{% endif %}
+  </table>
+  
+  {% include '_postnav.html' %}
 
 {% endblock %}
 

backend/config.py

@@ -16,6 +16,7 @@ class Config:
     ADMINS = [os.environ.get('DOTENV_ADMIN_EMAIL')]
     FROM_ADDRESS = os.environ.get('DOTENV_FROM_ADDRESS')
     REAL_HOSTNAME = os.environ.get('DOTENV_REAL_HOSTNAME')
+    ALLOW_REGISTRATION = os.environ.get('DOTENV_ALLOW_REGISTRATION')
 
 
     DC_LOGGING = True

compose.yaml

@@ -1,6 +1,7 @@
 services:
   db:
     image: mariadb:lts
+    command: "--skip-name-resolve=OFF"
     restart: always
     healthcheck:
       test: ['CMD', 'healthcheck.sh', '--connect', '--innodb_initialized']
@@ -15,6 +16,7 @@ services:
     networks:
       - backnet
     environment:
+      - MARIADB_ROOT_HOST=localhost
       - MARIADB_ROOT_PASSWORD=${DOTENV_MYSQL_ROOT_PASSWORD}
     expose:
       - 3306
@@ -29,7 +31,8 @@ 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
       #- MYSQL_PASSWORD=flaskp
@@ -41,6 +44,7 @@ services:
       - DOTENV_FROM_ADDRESS=${FLASK_MAIL_FROM}
       - DOTENV_JWT_PHRASE=${FLASK_JWT_PHRASE}
       - DOTENV_REAL_HOSTNAME=${FLASK_REAL_HOSTNAME}
+      - DOTENV_ALLOW_REGISTRATION=${ALLOW_REGISTRATION}
     #ports:
     #  - 8000:8000
     expose:
@@ -74,7 +78,7 @@ services:
       - GITEA__service__REGISTER_EMAIL_CONFIRM=true
       - GITEA__service__ENABLE_NOTIFY_MAIL=true
       # To disable new users after setup:
-      #- GITEA__service__DISABLE_REGISTRATION=false
+      - GITEA__service__DISABLE_REGISTRATION=true
     networks:
       - backnet
       - frontnet
@@ -92,12 +96,22 @@ services:
   proxy:
     build: proxy
     restart: always
-    #volumes:
-    #  - /home/finn/d/cert/var/lib/letsencrypt:/var/lib/letsencrypt:ro
-    #  - /home/finn/d/cert/etc/letsencrypt:/etc/letsencrypt:ro
+    volumes:
+      - /home/finn/d/cert/var/lib/letsencrypt:/var/lib/letsencrypt:ro
+      - /home/finn/d/cert/etc/letsencrypt:/etc/letsencrypt:ro
     ports:
-      - 80:80
-      - 443:443
+      - "80:80"
+      - "443:443"
+    depends_on: 
+      - backend
+    networks:
+      - frontnet
+  hs:
+    container_name: tor_service
+    build:
+      context: tor
+    environment:
+      - USE_TOR=${USE_TOR}
     depends_on:
       - backend
     networks:
@@ -121,10 +135,26 @@ services:
     networks:
       - backnet
 
+  sshtun:
+    build:
+      context: sshtun
+      dockerfile: Dockerfile
+    restart: on-failure
+    environment:
+      - USE_TUN=${USE_TUN}
+    ports:
+      - "22222:22"
+    expose:
+      - "11112"
+    networks:
+      - frontnet
+
 volumes:
   db-data:
   pmb-root:
 
 networks:
   backnet:
+    name: backnet
   frontnet:
+    name: frontnet

compose.yaml.local

@@ -1,6 +1,7 @@
 services:
   db:
     image: mariadb:lts
+    command: "--skip-name-resolve=OFF"
     restart: always
     healthcheck:
       test: ['CMD', 'healthcheck.sh', '--connect', '--innodb_initialized']
@@ -15,6 +16,7 @@ services:
     networks:
       - backnet
     environment:
+      - MARIADB_ROOT_HOST=localhost
       - MARIADB_ROOT_PASSWORD=${DOTENV_MYSQL_ROOT_PASSWORD}
     expose:
       - 3306
@@ -30,6 +32,7 @@ services:
     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"]
+    container_name: backend
     environment:
       - MYSQL_USER=flasku
       #- MYSQL_PASSWORD=flaskp
@@ -41,6 +44,7 @@ services:
       - DOTENV_FROM_ADDRESS=${FLASK_MAIL_FROM}
       - DOTENV_JWT_PHRASE=${FLASK_JWT_PHRASE}
       - DOTENV_REAL_HOSTNAME=${FLASK_REAL_HOSTNAME}
+      - DOTENV_ALLOW_REGISTRATION=${ALLOW_REGISTRATION}
     #ports:
     #  - 8000:8000
     expose:
@@ -74,7 +78,7 @@ services:
       - GITEA__service__REGISTER_EMAIL_CONFIRM=true
       - GITEA__service__ENABLE_NOTIFY_MAIL=true
       # To disable new users after setup:
-      #- GITEA__service__DISABLE_REGISTRATION=false
+      - GITEA__service__DISABLE_REGISTRATION=true
     networks:
       - backnet
       - frontnet
@@ -96,8 +100,18 @@ services:
     #  - /home/finn/d/cert/var/lib/letsencrypt:/var/lib/letsencrypt:ro
     #  - /home/finn/d/cert/etc/letsencrypt:/etc/letsencrypt:ro
     ports:
-      - 80:80
-      - 443:443
+      - "80:80"
+      - "443:443"
+    depends_on: 
+      - backend
+    networks:
+      - frontnet
+  hs:
+    container_name: tor_service
+    build:
+      context: tor
+    environment:
+      - USE_TOR=${USE_TOR}
     depends_on:
       - backend
     networks:
@@ -121,10 +135,26 @@ services:
     networks:
       - backnet
 
+  sshtun:
+    build:
+      context: sshtun
+      dockerfile: Dockerfile
+    restart: on-failure
+    environment:
+      - USE_TUN=${USE_TUN}
+    ports:
+      - "22222:22"
+    expose:
+      - "11112"
+    networks:
+      - frontnet
+
 volumes:
   db-data:
   pmb-root:
 
 networks:
   backnet:
+    name: backnet
   frontnet:
+    name: frontnet

compose.yaml.prod

@@ -1,6 +1,7 @@
 services:
   db:
     image: mariadb:lts
+    command: "--skip-name-resolve=OFF"
     restart: always
     healthcheck:
       test: ['CMD', 'healthcheck.sh', '--connect', '--innodb_initialized']
@@ -15,6 +16,7 @@ services:
     networks:
       - backnet
     environment:
+      - MARIADB_ROOT_HOST=localhost
       - MARIADB_ROOT_PASSWORD=${DOTENV_MYSQL_ROOT_PASSWORD}
     expose:
       - 3306
@@ -30,6 +32,7 @@ services:
     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"]
+    container_name: backend
     environment:
       - MYSQL_USER=flasku
       #- MYSQL_PASSWORD=flaskp
@@ -41,6 +44,7 @@ services:
       - DOTENV_FROM_ADDRESS=${FLASK_MAIL_FROM}
       - DOTENV_JWT_PHRASE=${FLASK_JWT_PHRASE}
       - DOTENV_REAL_HOSTNAME=${FLASK_REAL_HOSTNAME}
+      - DOTENV_ALLOW_REGISTRATION=${ALLOW_REGISTRATION}
     #ports:
     #  - 8000:8000
     expose:
@@ -74,7 +78,7 @@ services:
       - GITEA__service__REGISTER_EMAIL_CONFIRM=true
       - GITEA__service__ENABLE_NOTIFY_MAIL=true
       # To disable new users after setup:
-      #- GITEA__service__DISABLE_REGISTRATION=false
+      - GITEA__service__DISABLE_REGISTRATION=true
     networks:
       - backnet
       - frontnet
@@ -96,8 +100,18 @@ services:
       - /home/finn/d/cert/var/lib/letsencrypt:/var/lib/letsencrypt:ro
       - /home/finn/d/cert/etc/letsencrypt:/etc/letsencrypt:ro
     ports:
-      - 80:80
-      - 443:443
+      - "80:80"
+      - "443:443"
+    depends_on: 
+      - backend
+    networks:
+      - frontnet
+  hs:
+    container_name: tor_service
+    build:
+      context: tor
+    environment:
+      - USE_TOR=${USE_TOR}
     depends_on:
       - backend
     networks:
@@ -121,10 +135,26 @@ services:
     networks:
       - backnet
 
+  sshtun:
+    build:
+      context: sshtun
+      dockerfile: Dockerfile
+    restart: on-failure
+    environment:
+      - USE_TUN=${USE_TUN}
+    ports:
+      - "22222:22"
+    expose:
+      - "11112"
+    networks:
+      - frontnet
+
 volumes:
   db-data:
   pmb-root:
 
 networks:
   backnet:
+    name: backnet
   frontnet:
+    name: frontnet

db/init/01-databases.sql

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

dotenv

@@ -1,27 +1,34 @@
 # Example .env file
-DOTENV_MYSQL_ROOT_PASSWORD_OLD=rootp
-DOTENV_MYSQL_ROOT_PASSWORD=rootp
+DOTENV_MYSQL_ROOT_PASSWORD_OLD="rootp"
+DOTENV_MYSQL_ROOT_PASSWORD="rootp"
 
-DOTENV_MYSQL_GITEA_PASSWORD=giteap
-DOTENV_MYSQL_FLASK_PASSWORD=flaskp
+DOTENV_MYSQL_GITEA_PASSWORD="giteap"
+DOTENV_MYSQL_FLASK_PASSWORD="flaskp"
 
-GITEA_MAIL_FROM="git@changeme"
+GITEA_MAIL_FROM="git@aaa"
 
 # Build ARG GPG_PP. May still need to be empty to avoid breakage.
 BUILD_GPG_PP=
 
+# Tor:
+# true/false:
+USE_TOR=false
+# SSH Tun:
+# true/false:
+USE_TUN=false
 
 # Backend:
-
-FLASK_SECRET_KEY="changeme"
+FLASK_SECRET_KEY="flaskkey"
 # Inconsequential token: minimal inconvenience if exposed
-FLASK_TOKEN_I=dti
-
+FLASK_TOKEN_I="dti"
 # Consequential token: protect
-FLASK_TOKEN_C=dtc
-
-FLASK_MAIL_FROM="git@changeme"
+FLASK_TOKEN_C="dtc"
+# true/false:
+ALLOW_REGISTRATION=true
+FLASK_MAIL_FROM="git@aaa"
 # admin email must be valid send from with mail subsystem
-FLASK_ADMIN_EMAIL="git@changeme"
+FLASK_ADMIN_EMAIL="git@aaa"
 FLASK_JWT_PHRASE="jwtphrase"
 FLASK_REAL_HOSTNAME="localhost"
+
+

other/dbbu.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+# dump sql db backups
+#
+
+if [[ -z $1 ]] ; then
+        echo "dbbu.sh <gitea|flask|all>"
+        exit 0
+fi
+
+source ../.env
+source .env
+
+TIMESTAMP=$(date +%s)
+
+if [[ $1 == "gitea" || $1 == "all" ]] ; then
+	docker-compose exec db bash -c "mariadb-dump -uroot -p$DOTENV_MYSQL_ROOT_PASSWORD gitea > /bu/gitea_bu_$TIMESTAMP.sql"
+	docker-compose exec db chmod a+rw /bu/gitea_bu_$TIMESTAMP.sql
+	docker-compose exec db chown ubuntu:ubuntu /bu/gitea_bu_$TIMESTAMP.sql
+fi
+
+if [[ $1 == "flask" || $1 == "all" ]] ; then
+	docker-compose exec db echo $DOTENV_MYSQL_ROOT_PASSWORD
+	docker-compose exec db bash -c "mariadb-dump -uroot -p$DOTENV_MYSQL_ROOT_PASSWORD flask > /bu/flask_bu_$TIMESTAMP.sql"
+	docker-compose exec db chmod a+rw /bu/flask_bu_$TIMESTAMP.sql
+	docker-compose exec db chown ubuntu:ubuntu /bu/flask_bu_$TIMESTAMP.sql
+fi
+

other/sqlpass.sh

@@ -19,10 +19,10 @@ echo "Changing app db passwords in 5 seconds..."
 sleep 6
 
 # Flask
-docker-compose exec db mariadb --database=mysql -uroot -p$DOTENV_MYSQL_ROOT_PASSWORD_OLD -e "ALTER USER 'flasku' IDENTIFIED BY '"$DOTENV_MYSQL_FLASK_PASSWORD"';"
+docker-compose exec db mariadb --database=mysql -uroot -p$DOTENV_MYSQL_ROOT_PASSWORD_OLD -e "ALTER USER 'flasku'@'backend.backnet' IDENTIFIED BY '"$DOTENV_MYSQL_FLASK_PASSWORD"';"
 
 # Gitea
-docker-compose exec db mariadb --database=mysql -uroot -p$DOTENV_MYSQL_ROOT_PASSWORD_OLD -e "ALTER USER 'gitea' IDENTIFIED BY '"$DOTENV_MYSQL_GITEA_PASSWORD"';"
+docker-compose exec db mariadb --database=mysql -uroot -p$DOTENV_MYSQL_ROOT_PASSWORD_OLD -e "ALTER USER 'gitea'@'gitea.backnet' IDENTIFIED BY '"$DOTENV_MYSQL_GITEA_PASSWORD"';"
 
 
 docker-compose exec db mariadb --database=mysql -uroot -p$DOTENV_MYSQL_ROOT_PASSWORD_OLD -e "FLUSH PRIVILEGES;"

proxy/conf

@@ -1,12 +1,53 @@
+#server {
+#    listen       80;
+#    server_name  localhost;
+#    location / {
+#        proxy_pass   http://backend:8000;
+#    }
+
+
+# always redirect to https
 server {
-    listen       80;
-    server_name  localhost;
+	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;
+		proxy_pass http://backend:8000/;
 	}
-    location /gutty{
-        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 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/;
 	}
+}
+

proxy/giteaconf

@@ -0,0 +1,17 @@
+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

@@ -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/Dockerfile

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,14 @@
+#!/bin/bash
+# Container goal: egress
+# first:	physical_box$ autossh -N -R 11111:localhost:11434 -i sshtun/oilykey/<SOMEKEY> -p 22222 <rem_vps_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
+
+if $USE_TUN ; then
+	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
+

tor/Dockerfile

@@ -0,0 +1,20 @@
+FROM alpine
+
+RUN adduser --disabled-password --gecos "" tor
+
+RUN apk update && apk add tor
+
+COPY hidden_service /hidden_service
+COPY torrc /etc/tor/torrc
+COPY entrypoint.sh /
+
+RUN chown -R tor /etc/tor
+RUN chown -R tor /hidden_service
+RUN chown -R tor /entrypoint.sh
+RUN chmod -R go-rwx /etc/tor
+RUN chmod -R go-rwx /hidden_service
+
+USER tor
+
+ENTRYPOINT ["/entrypoint.sh"]
+

tor/README.md

@@ -0,0 +1,5 @@
+## Tor entry:
+
+Untracked in this dir, a directory called "hidden_service".
+
+This dir is sensitive, and requires manual backup strategy.

tor/entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/ash
+
+if $USE_TOR ; then
+	echo "@@@@@@@@@@ TOR ENABLED BY ENV"
+	exec /usr/bin/tor
+else
+	echo "@@@@@@@@@@ TOR DISABLED BY ENV"
+fi

tor/torrc

@@ -0,0 +1,195 @@
+## Configuration file for a typical Tor user
+## Last updated 9 October 2013 for Tor 0.2.5.2-alpha.
+## (may or may not work for much older or much newer versions of Tor.)
+##
+## Lines that begin with "## " try to explain what's going on. Lines
+## that begin with just "#" are disabled commands: you can enable them
+## by removing the "#" symbol.
+##
+## See 'man tor', or https://www.torproject.org/docs/tor-manual.html,
+## for more options you can use in this file.
+##
+## Tor will look for this file in various places based on your platform:
+## https://www.torproject.org/docs/faq#torrc
+
+## Tor opens a socks proxy on port 9050 by default -- even if you don't
+## configure one below. Set "SocksPort 0" if you plan to run Tor only
+## as a relay, and not make any local application connections yourself.
+#SocksPort 9050 # Default: Bind to localhost:9050 for local connections.
+#SocksPort 192.168.0.1:9100 # Bind to this address:port too.
+
+## Entry policies to allow/deny SOCKS requests based on IP address.
+## First entry that matches wins. If no SocksPolicy is set, we accept
+## all (and only) requests that reach a SocksPort. Untrusted users who
+## can access your SocksPort may be able to learn about the connections
+## you make.
+#SocksPolicy accept 192.168.0.0/16
+#SocksPolicy reject *
+
+## Logs go to stdout at level "notice" unless redirected by something
+## else, like one of the below lines. You can have as many Log lines as
+## you want.
+##
+## We advise using "notice" in most cases, since anything more verbose
+## may provide sensitive information to an attacker who obtains the logs.
+##
+## Send all messages of level 'notice' or higher to /var/log/tor/notices.log
+#Log notice file /var/log/tor/notices.log
+## Send every possible message to /var/log/tor/debug.log
+#Log debug file /var/log/tor/debug.log
+## Use the system log instead of Tor's logfiles
+#Log notice syslog
+## To send all messages to stderr:
+#Log debug stderr
+
+## Uncomment this to start the process in the background... or use
+## --runasdaemon 1 on the command line. This is ignored on Windows;
+## see the FAQ entry if you want Tor to run as an NT service.
+#RunAsDaemon 1
+
+## The directory for keeping all the keys/etc. By default, we store
+## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
+#DataDirectory /var/lib/tor
+
+## The port on which Tor will listen for local connections from Tor
+## controller applications, as documented in control-spec.txt.
+#ControlPort 9051
+## If you enable the controlport, be sure to enable one of these
+## authentication methods, to prevent attackers from accessing it.
+#HashedControlPassword 16:872860B76453A77D60CA2BB8C1A7042072093276A3D701AD684053EC4C
+#CookieAuthentication 1
+
+############### This section is just for location-hidden services ###
+
+## Once you have configured a hidden service, you can look at the
+## contents of the file ".../hidden_service/hostname" for the address
+## to tell people.
+##
+## HiddenServicePort x y:z says to redirect requests on port x to the
+## address y:z.
+
+HiddenServiceDir /hidden_service/
+HiddenServicePort 80 backend:8000
+
+#HiddenServiceDir /var/lib/tor/hidden_service/
+#HiddenServicePort 80 127.0.0.1:80
+
+#HiddenServiceDir /var/lib/tor/other_hidden_service/
+#HiddenServicePort 80 127.0.0.1:80
+#HiddenServicePort 22 127.0.0.1:22
+
+################ This section is just for relays #####################
+#
+## See https://www.torproject.org/docs/tor-doc-relay for details.
+
+## Required: what port to advertise for incoming Tor connections.
+#ORPort 9001
+## If you want to listen on a port other than the one advertised in
+## ORPort (e.g. to advertise 443 but bind to 9090), you can do it as
+## follows.  You'll need to do ipchains or other port forwarding
+## yourself to make this work.
+#ORPort 443 NoListen
+#ORPort 127.0.0.1:9090 NoAdvertise
+
+## The IP address or full DNS name for incoming connections to your
+## relay. Leave commented out and Tor will guess.
+#Address noname.example.com
+
+## If you have multiple network interfaces, you can specify one for
+## outgoing traffic to use.
+# OutboundBindAddress 10.0.0.5
+
+## A handle for your relay, so people don't have to refer to it by key.
+#Nickname ididnteditheconfig
+
+## Define these to limit how much relayed traffic you will allow. Your
+## own traffic is still unthrottled. Note that RelayBandwidthRate must
+## be at least 20 KB.
+## Note that units for these config options are bytes per second, not bits
+## per second, and that prefixes are binary prefixes, i.e. 2^10, 2^20, etc.
+#RelayBandwidthRate 100 KB  # Throttle traffic to 100KB/s (800Kbps)
+#RelayBandwidthBurst 200 KB # But allow bursts up to 200KB/s (1600Kbps)
+
+## Use these to restrict the maximum traffic per day, week, or month.
+## Note that this threshold applies separately to sent and received bytes,
+## not to their sum: setting "4 GB" may allow up to 8 GB total before
+## hibernating.
+##
+## Set a maximum of 4 gigabytes each way per period.
+#AccountingMax 4 GB
+## Each period starts daily at midnight (AccountingMax is per day)
+#AccountingStart day 00:00
+## Each period starts on the 3rd of the month at 15:00 (AccountingMax
+## is per month)
+#AccountingStart month 3 15:00
+
+## Administrative contact information for this relay or bridge. This line
+## can be used to contact you if your relay or bridge is misconfigured or
+## something else goes wrong. Note that we archive and publish all
+## descriptors containing these lines and that Google indexes them, so
+## spammers might also collect them. You may want to obscure the fact that
+## it's an email address and/or generate a new address for this purpose.
+#ContactInfo Random Person <nobody AT example dot com>
+## You might also include your PGP or GPG fingerprint if you have one:
+#ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com>
+
+## Uncomment this to mirror directory information for others. Please do
+## if you have enough bandwidth.
+#DirPort 9030 # what port to advertise for directory connections
+## If you want to listen on a port other than the one advertised in
+## DirPort (e.g. to advertise 80 but bind to 9091), you can do it as
+## follows.  below too. You'll need to do ipchains or other port
+## forwarding yourself to make this work.
+#DirPort 80 NoListen
+#DirPort 127.0.0.1:9091 NoAdvertise
+## Uncomment to return an arbitrary blob of html on your DirPort. Now you
+## can explain what Tor is if anybody wonders why your IP address is
+## contacting them. See contrib/tor-exit-notice.html in Tor's source
+## distribution for a sample.
+#DirPortFrontPage /etc/tor/tor-exit-notice.html
+
+## Uncomment this if you run more than one Tor relay, and add the identity
+## key fingerprint of each Tor relay you control, even if they're on
+## different networks. You declare it here so Tor clients can avoid
+## using more than one of your relays in a single circuit. See
+## https://www.torproject.org/docs/faq#MultipleRelays
+## However, you should never include a bridge's fingerprint here, as it would
+## break its concealability and potentionally reveal its IP/TCP address.
+#MyFamily $keyid,$keyid,...
+
+## A comma-separated list of exit policies. They're considered first
+## to last, and the first match wins. If you want to _replace_
+## the default exit policy, end this with either a reject *:* or an
+## accept *:*. Otherwise, you're _augmenting_ (prepending to) the
+## default exit policy. Leave commented to just use the default, which is
+## described in the man page or at
+## https://www.torproject.org/documentation.html
+##
+## Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses
+## for issues you might encounter if you use the default exit policy.
+##
+## If certain IPs and ports are blocked externally, e.g. by your firewall,
+## you should update your exit policy to reflect this -- otherwise Tor
+## users will be told that those destinations are down.
+##
+## For security, by default Tor rejects connections to private (local)
+## networks, including to your public IP address. See the man page entry
+## for ExitPolicyRejectPrivate if you want to allow "exit enclaving".
+##
+#ExitPolicy accept *:6660-6667,reject *:* # allow irc ports but no more
+#ExitPolicy accept *:119 # accept nntp as well as default exit policy
+#ExitPolicy reject *:* # no exits allowed
+
+## Bridge relays (or "bridges") are Tor relays that aren't listed in the
+## main directory. Since there is no complete public list of them, even an
+## ISP that filters connections to all the known Tor relays probably
+## won't be able to block all the bridges. Also, websites won't treat you
+## differently because they won't know you're running Tor. If you can
+## be a real relay, please do; but if not, be a bridge!
+#BridgeRelay 1
+## By default, Tor will advertise your bridge to users through various
+## mechanisms like https://bridges.torproject.org/. If you want to run
+## a private bridge, for example because you'll give out your bridge
+## address manually to your friends, uncomment this line:
+#PublishServerDescriptor 0
+