Invario/Inventarsystem
3
1
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases 216 Wiki Activity

Changes of the settings.py and in generell the Variable Proccessing to have a more secure deployment Process

Browse Source
This commit is contained in:
AIIrondev
2026-07-28 20:52:05 +02:00
parent ea402f3223
commit 315918098d
3 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/release-docker.yml
+29 -20
View File
@@ -200,26 +200,35 @@ jobs:
- name: Create release-only docker bundle - name: Create release-only docker bundle
run: | run: |
mkdir -p release-bundle mkdir -p release-bundle
cat > release-bundle/docker-compose.yml <<EOF cat > release-bundle/docker-compose.yml <<EOF
services: services:
app: app:
image: \${INVENTAR_APP_IMAGE:-${{ steps.meta.outputs.image }}} image: \${INVENTAR_APP_IMAGE:-${{ steps.meta.outputs.image }}}
container_name: inventarsystem-app container_name: inventarsystem-app
restart: unless-stopped restart: unless-stopped
ports: ports:
- "\${INVENTAR_HTTP_PORT:-10000}:8000" - "\${INVENTAR_HTTP_PORT:-10000}:8000"
depends_on: depends_on:
- mongodb - mongodb
- redis - redis
environment: environment:
INVENTAR_MONGODB_HOST: mongodb INVENTAR_MONGODB_HOST: mongodb
INVENTAR_MONGODB_PORT: "27017" INVENTAR_MONGODB_PORT: "27017"
INVENTAR_MONGODB_DB: Inventarsystem INVENTAR_MONGODB_DB: Inventarsystem
INVENTAR_BACKUP_FOLDER: /data/backups INVENTAR_BACKUP_FOLDER: /data/backups
INVENTAR_LOGS_FOLDER: /data/logs INVENTAR_LOGS_FOLDER: /data/logs
expose: INVENTAR_SECRET_KEY: \${INVENTAR_SECRET_KEY}
- "8000" INVENTAR_DATA_ENCRYPTION_KEY: \${INVENTAR_DATA_ENCRYPTION_KEY}
INVENTAR_MONGODB_PASSWORD: \${INVENTAR_MONGODB_PASSWORD}
INVENTAR_SECRET_KEY: \${INVENTAR_SECRET_KEY}
EMAIL_ENABLED: \${EMAIL_ENABLED}
EMAIL_SMTP_HOST: \${EMAIL_SMTP_HOST}
EMAIL_SMTP_PORT: \${EMAIL_SMTP_PORT}
EMAIL_USERNAME: \${EMAIL_USERNAME}
EMAIL_PASSWORD: \${EMAIL_PASSWORD}
expose:
- "8000"
volumes: volumes:
- ./config.json:/app/config.json:ro - ./config.json:/app/config.json:ro
- app_uploads:/app/Web/uploads - app_uploads:/app/Web/uploads
Web/modules/database/settings.py
+8 -8
View File
@@ -220,15 +220,15 @@ SSL_CERT = _get(_conf, ['ssl', 'cert'], DEFAULTS['ssl']['cert'])
SSL_KEY = _get(_conf, ['ssl', 'key'], DEFAULTS['ssl']['key']) SSL_KEY = _get(_conf, ['ssl', 'key'], DEFAULTS['ssl']['key'])
# Email settings # Email settings
EMAIL_ENABLED = _get(_conf, ['email', 'enabled'], False) EMAIL_ENABLED = bool(os.getenv('EMAIL_ENABLED', False))
EMAIL_SMTP_HOST = _get(_conf, ['email', 'smtp_host'], 'smtp.gmail.com') EMAIL_SMTP_HOST = str(os.getenv('EMAIL_SMTP_HOST', False))
EMAIL_SMTP_PORT = int(_get(_conf, ['email', 'smtp_port'], 587)) EMAIL_SMTP_PORT = int(os.getenv('EMAIL_SMTP_PORT', 587))
EMAIL_USE_TLS = bool(_get(_conf, ['email', 'use_tls'], True)) EMAIL_USE_TLS = True
EMAIL_USERNAME = _get(_conf, ['email', 'username'], '') EMAIL_USERNAME = str(os.getenv('EMAIL_USERNAME', False))
EMAIL_PASSWORD = _get(_conf, ['email', 'password'], '') EMAIL_PASSWORD = str(os.getenv('EMAIL_PASSWORD', False))
EMAIL_FROM_ADDRESS = _get(_conf, ['email', 'from_address'], EMAIL_USERNAME) EMAIL_FROM_ADDRESS = _get(_conf, ['email', 'from_address'], EMAIL_USERNAME)
EMAIL_DEFAULT_SENDER_NAME = _get(_conf, ['email', 'default_sender_name'], 'Inventarsystem') EMAIL_DEFAULT_SENDER_NAME = "Invario Inventarsystem Sender"
EMAIL_TIMEOUT_SECONDS = int(_get(_conf, ['email', 'timeout_seconds'], 30)) EMAIL_TIMEOUT_SECONDS = 20
# School periods # School periods
SCHOOL_PERIODS = _get(_conf, ['schoolPeriods'], DEFAULTS['schoolPeriods']) SCHOOL_PERIODS = _get(_conf, ['schoolPeriods'], DEFAULTS['schoolPeriods'])
config.json
+4 -4
View File
@@ -21,12 +21,12 @@
}, },
"email": { "email": {
"enabled": true, "enabled": true,
"smtp_host": "mail.invario-software.de", "smtp_host": "",
"smtp_port": 587, "smtp_port": 587,
"use_tls": true, "use_tls": true,
"username": "no-reply@invario-software.de", "username": "",
"password": "#,EATwIn,68", "password": "",
"from_address": "no-reply@invario-software.de", "from_address": "",
"default_sender_name": "Invario Email Service", "default_sender_name": "Invario Email Service",
"timeout_seconds": 30 "timeout_seconds": 30
}, },