Make certbot silent

Removed abstraction of data location for image build

docker-compose.yml

@@ -1,5 +1,8 @@
 version: '3.9'
 
+volumes:
+  data:
+
 services:
   nginx:
     container_name: reftest_server
@@ -8,6 +11,7 @@ services:
       - ./certbot:/etc/letsencrypt:ro
       - ./nginx:/etc/nginx
       - ./src/html:/usr/share/nginx/html/
+      - ./ref-test/app/editor/static:/usr/share/nginx/html/admin/editor/static
       - ./ref-test/app/admin/static:/usr/share/nginx/html/admin/static
       - ./ref-test/app/quiz/static:/usr/share/nginx/html/quiz/static
       - ./ref-test/app/root:/usr/share/nginx/html/root
@@ -30,7 +34,7 @@ services:
     ports:
       - 5000
     volumes:
-      - ./ref-test/data:/ref-test/data
+      - data:/ref-test/data
     restart: unless-stopped
     networks:
       - frontend

install-script.sh

@@ -46,8 +46,6 @@ if [ ! -e "$data_path/lets-encrypt-x3-cross-signed.pem" ]; then
   echo "### Downloading lets-encrypt-x3-cross-signed.pem ..."
   wget -O $data_path/lets-encrypt-x3-cross-signed.pem \
   "https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.pem"
-  docker compose run --rm --entrypoint "\
-    openssl dhparam -out /etc/letsencrypt/ssl-dhparams.pem 4096" certbot
   echo
 fi
 
@@ -79,7 +77,7 @@ esac
 if [ $staging != "0" ]; then staging_arg="--staging"; fi
 
 docker compose run --rm --entrypoint "\
-  certbot certonly --webroot -w /var/www/html \
+  certbot certonly --non-interactive --webroot -w /var/www/html \
     $staging_arg \
     $email_arg \
     $domain_args \

nginx/conf.d/ref-test-app.conf

@@ -29,6 +29,11 @@ server {
         alias /usr/share/nginx/html/admin/static/;
     }
 
+    location ^~ /admin/editor/static/  {
+        include  /etc/nginx/mime.types;
+        alias /usr/share/nginx/html/admin/editor/static/;
+    }
+
     location / {
         include /etc/nginx/conf.d/proxy_headers.conf;
         proxy_pass http://reftest;

ref-test/Dockerfile

@@ -1,5 +1,8 @@
 FROM python:3.10-slim
+ARG DATA=./data/
+ENV DATA=$DATA
 WORKDIR /ref-test
 COPY . .
 RUN pip install --upgrade pip && pip install -r requirements.txt
+RUN chmod +x install.py && ./install.py
 CMD [ "gunicorn", "-b", "0.0.0.0:5000", "-w", "5", "wsgi:app" ]

ref-test/app/__init__.py

@@ -1,5 +1,4 @@
-from .config import Development as Config
-from .install import install_app
+from .config import Production as Config
 from .models import User
 from .extensions import bootstrap, csrf, db, login_manager, mail
 
@@ -53,7 +52,5 @@ def create_app():
     app.register_blueprint(views)
     app.register_blueprint(quiz)
     app.register_blueprint(editor, url_prefix='/admin/editor')
-
-    install_app(app)
     
     return app

ref-test/app/config.py

@@ -5,7 +5,7 @@ load_dotenv('../.env')
 
 class Config(object):
     APP_HOST = '0.0.0.0'
-    DATA = os.getenv('DATA')
+    DATA = './data/'
     DEBUG = False
     TESTING = False
     SECRET_KEY = os.getenv('SECRET_KEY')
@@ -15,16 +15,16 @@ class Config(object):
     SQLALCHEMY_TRACK_MODIFICATIONS = False
 
     MAIL_SERVER = os.getenv('MAIL_SERVER')
-    MAIL_PORT = int(os.getenv('MAIL_PORT'))
+    MAIL_PORT = int(os.getenv('MAIL_PORT') or 25)
     MAIL_USE_TLS = False
     MAIL_USE_SSL = False
     MAIL_DEBUG = False
     MAIL_USERNAME = os.getenv('MAIL_USERNAME')
     MAIL_PASSWORD = os.getenv('MAIL_PASSWORD')
     MAIL_DEFAULT_SENDER = os.getenv('MAIL_DEFAULT_SENDER')
-    MAIL_MAX_EMAILS = int(os.getenv('MAIL_MAX_EMAILS'))
+    MAIL_MAX_EMAILS = int(os.getenv('MAIL_MAX_EMAILS') or 25)
     MAIL_SUPPRESS_SEND = False
-    MAIL_ASCII_ATTACHMENTS = bool(os.getenv('MAIL_ASCII_ATTACHMENTS'))
+    MAIL_ASCII_ATTACHMENTS = bool(os.getenv('MAIL_ASCII_ATTACHMENTS') or True)
 
 class Production(Config):
     pass

ref-test/app/install.py

@@ -1,34 +0,0 @@
-from .extensions import db
-from .tools.data import save
-from .tools.logs import write
-
-from sqlalchemy_utils import create_database, database_exists
-
-from cryptography.fernet import Fernet
-from os import mkdir, path
-from pathlib import Path
-
-def install_app(app):
-    with app.app_context():
-        data = Path(app.config.get('DATA'))
-        database_uri = app.config.get('SQLALCHEMY_DATABASE_URI')
-        if not path.isdir(f'./{data}'): mkdir(f'./{data}')
-        if not path.isdir(f'./{data}/questions'): mkdir(f'./{data}/questions')
-        if not path.isfile(f'./{data}/.gitignore'):
-            with open(f'./{data}/.gitignore', 'a+') as file: file.write(f'*')
-        if not path.isfile(f'./{data}/config.json'): save({}, 'config.json')
-        if not path.isdir(f'./{data}/logs'): mkdir(f'./{data}/logs')
-        if not path.isfile(f'./{data}/logs/users.log'): write('users.log', 'Log file created.')
-        if not path.isfile(f'./{data}/logs/system.log'): write('system.log', 'Log file created.')
-        if not path.isfile(f'./{data}/logs/tests.log'): write('tests.log', 'Log file created.')
-        if not database_exists(database_uri):       
-            create_database(database_uri)
-            write('system.log', 'No database found. Creating a new database.')
-            from .models import Entry, Dataset, Test, User
-            db.create_all()
-            write('system.log', 'Creating database schema.')
-        if not path.isfile(f'./{data}/.encryption.key'):
-            write('system.log', 'No encryption key found. Generating new encryption key.')
-            with open(f'./{data}/.encryption.key', 'wb') as key_file:
-                key = Fernet.generate_key()
-                key_file.write(key)

ref-test/app/models/dataset.py

@@ -102,7 +102,7 @@ class Dataset(db.Model):
         with open(file_path, 'w') as file:
             dump(data, file, indent=2)
         write('system.log', f'Dataset {self.id} edited by {current_user.get_username()}.')
-        flash(f'Dataset {self.name} successfully edited.', 'success')
+        flash(f'Dataset {self.get_name()} successfully edited.', 'success')
         db.session.add(self)
         db.session.commit()
         return True, 'Dataset successfully edited.'

ref-test/install.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+from main import app
+from app.extensions import db
+from app.tools.data import save
+from app.tools.logs import write
+from sqlalchemy_utils import create_database, database_exists
+from cryptography.fernet import Fernet
+from os import mkdir, path
+from pathlib import Path
+
+data = Path(app.config.get('DATA'))
+database_uri = app.config.get('SQLALCHEMY_DATABASE_URI')
+
+with app.app_context():
+    if not path.isdir(f'./{data}'): mkdir(f'./{data}')
+    if not path.isdir(f'./{data}/questions'): mkdir(f'./{data}/questions')
+    if not path.isfile(f'./{data}/.gitignore'):
+        with open(f'./{data}/.gitignore', 'w') as file: file.write(f'*')
+    if not path.isfile(f'./{data}/config.json'): save({}, 'config.json')
+    if not path.isdir(f'./{data}/logs'): mkdir(f'./{data}/logs')
+    if not path.isfile(f'./{data}/logs/users.log'): write('users.log', 'Log file created.')
+    if not path.isfile(f'./{data}/logs/system.log'): write('system.log', 'Log file created.')
+    if not path.isfile(f'./{data}/logs/tests.log'): write('tests.log', 'Log file created.')
+    if not database_exists(database_uri):
+        create_database(database_uri)
+        write('system.log', 'No database found. Creating a new database.')
+        from app.models import *
+        db.create_all()
+        write('system.log', 'Creating database schema.')
+    if not path.isfile(f'./{data}/.encryption.key'):
+        write('system.log', 'No encryption key found. Generating new encryption key.')
+        with open(f'./{data}/.encryption.key', 'wb') as key_file:
+            key = Fernet.generate_key()
+            key_file.write(key)