Scott.Idem/OSIT-AE-Docker-Env
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix for the restore script. It now deletes the temp backup directories automatically.

Browse Source
This commit is contained in:
Scott Idem
2026-01-13 12:47:08 -05:00
parent ea45d99f13
commit 6297df094d
7 changed files with 90 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@@ -67,6 +67,8 @@ environment/
*.bak *.bak
*.kate-swp *.kate-swp
.directory .directory
archives/
archives_and_old/
backups/ backups/
bak/ bak/
downloads/ downloads/
@@ -82,8 +84,9 @@ logs/apache2/
logs/mailman2/ logs/mailman2/
# logs/php7/ # logs/php7/
# logs/web/ # logs/web/
tmp/ old/
temp/ temp/
tmp/
# OSIT and Aether specific: # OSIT and Aether specific:

8
docker-compose.yml
View File

@@ -54,6 +54,7 @@ services:
restart: always restart: always
image: mariadb:10.11 image: mariadb:10.11
container_name: ae_mariadb_dev container_name: ae_mariadb_dev
profiles: ["database"]
command: [ command: [
"mysqld", "mysqld",
"--max-connections=${MARIADB_MAX_CONNECTIONS}", "--max-connections=${MARIADB_MAX_CONNECTIONS}",
@@ -68,6 +69,8 @@ services:
MYSQL_DATABASE: ${AE_DB_NAME} MYSQL_DATABASE: ${AE_DB_NAME}
MYSQL_USER: ${AE_DB_USERNAME} MYSQL_USER: ${AE_DB_USERNAME}
MYSQL_PASSWORD: ${AE_DB_PASSWORD} MYSQL_PASSWORD: ${AE_DB_PASSWORD}
ports:
- "${AE_DB_EXTERNAL_PORT}:3306"
volumes: volumes:
- ./srv/mariadb:/var/lib/mysql - ./srv/mariadb:/var/lib/mysql
- ./conf/mariadb/server.cnf:/etc/mysql/conf.d/server.cnf - ./conf/mariadb/server.cnf:/etc/mysql/conf.d/server.cnf
@@ -81,6 +84,7 @@ services:
restart: always restart: always
image: phpmyadmin/phpmyadmin image: phpmyadmin/phpmyadmin
container_name: ae_pma_dev container_name: ae_pma_dev
profiles: ["database"]
environment: environment:
PMA_HOST: mariadb PMA_HOST: mariadb
UPLOAD_LIMIT: 64M UPLOAD_LIMIT: 64M
@@ -120,7 +124,6 @@ services:
- ./temp/ae_api:/temp - ./temp/ae_api:/temp
depends_on: depends_on:
- redis - redis
- mariadb
stdin_open: true stdin_open: true
tty: true tty: true
logging: logging:
@@ -129,6 +132,8 @@ services:
max-size: "10m" max-size: "10m"
max-file: "3" max-file: "3"
# *Legacy* Aether Flask Application served with Gunicorn
# *NOTE:* This legacy frontend using Flask is being replaced by the new one using SvelteKit.
aether_app_gunicorn: aether_app_gunicorn:
# ... (same as before) ... # ... (same as before) ...
restart: always restart: always
@@ -182,6 +187,7 @@ services:
container_name: ae_ops_dev container_name: ae_ops_dev
image: alpine:latest image: alpine:latest
restart: always restart: always
profiles: ["database"]
env_file: env_file:
- ./.env - ./.env
volumes: volumes:

10
env.default
View File

@@ -8,6 +8,8 @@
TZ=US/Eastern TZ=US/Eastern
OSIT_ENV=development OSIT_ENV=development
AE_LOG_LVL=warning AE_LOG_LVL=warning
# Profiles: 'database' includes mariadb, phpmyadmin, ae_ops. Comment out or leave empty for app-only nodes.
COMPOSE_PROFILES=database
# Container Names # Container Names
CONTAINER_WEB=ae_web_default CONTAINER_WEB=ae_web_default
@@ -44,11 +46,19 @@ DOCKER_OSIT_SERVER_NAME=example-docker.oneskyit.com
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# DATABASE SETTINGS (MariaDB) # DATABASE SETTINGS (MariaDB)
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# To use an external DB:
# 1. Set COMPOSE_PROFILES= (empty) in .env to disable local DB containers.
# 2. Set AE_DB_SERVER to the external IP/Hostname.
# 3. Ensure the external DB allows connections from this host.
# AE_DB_SERVER=HOSTNAME or IP_ADDRESS or "vpn-db.oneskyit.com"
AE_DB_SERVER=mariadb AE_DB_SERVER=mariadb
AE_DB_PORT=3306 AE_DB_PORT=3306
# Port to expose on the host if running local MariaDB (default 3306)
AE_DB_EXTERNAL_PORT=3306
AE_DB_NAME=aether_dev AE_DB_NAME=aether_dev
AE_DB_USERNAME=osit_aether AE_DB_USERNAME=osit_aether
AE_DB_PASSWORD="your-password-here" AE_DB_PASSWORD="your-password-here"
AE_DB_ROOT_PASSWORD="mariadb-root-password-here"
# Connection Tuning # Connection Tuning
AE_DB_CONNECTION_TIMEOUT=15 AE_DB_CONNECTION_TIMEOUT=15

44
html_php/index.html Normal file
View File

@@ -0,0 +1,44 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Aether Workstation Dashboard</title>
<style>
body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; background: #1a1a1a; color: #e0e0e0; display: flex; justify-content: center; align-items: center; height: 100vh; margin: 0; }
.container { background: #2d2d2d; padding: 2rem; border-radius: 12px; box-shadow: 0 10px 30px rgba(0,0,0,0.5); width: 400px; }
h1 { color: #4CAF50; margin-top: 0; font-size: 1.5rem; border-bottom: 1px solid #444; padding-bottom: 1rem; }
.links { display: grid; gap: 1rem; margin-top: 1.5rem; }
a { background: #3d3d3d; color: #fff; text-decoration: none; padding: 1rem; border-radius: 8px; transition: transform 0.1s, background 0.2s; display: flex; align-items: center; justify-content: space-between; }
a:hover { background: #4d4d4d; transform: translateY(-2px); }
.port { font-family: monospace; color: #888; font-size: 0.9rem; }
.status { font-size: 0.8rem; color: #4CAF50; margin-top: 2rem; text-align: center; border-top: 1px solid #444; padding-top: 1rem; }
</style>
</head>
<body>
<div class="container">
<h1>Aether Dev Environment</h1>
<div class="links">
<a href="http://localhost:8881" target="_blank">
<span>Dozzle (Live Logs)</span>
<span class="port">:8881</span>
</a>
<a href="http://localhost:8081" target="_blank">
<span>phpMyAdmin (Database)</span>
<span class="port">:8081</span>
</a>
<a href="https://dev-api.oneskyit.com/docs" target="_blank">
<span>API Docs (Swagger)</span>
<span class="port">/docs</span>
</a>
<a href="https://dev-app.oneskyit.com" target="_blank">
<span>Aether App (Flask)</span>
<span class="port">:443</span>
</a>
</div>
<div class="status">
Workstation Mode • Arch Linux
</div>
</div>
</body>
</html>

18
html_php/index.php Normal file
View File

@@ -0,0 +1,18 @@
<html>
<head>
<title>Aether Docker Compose</title>
<meta content="">
<style></style>
</head>
<body>
<h1>Running with Docker Compose</h1>
<hr>
<?php
echo phpinfo();
?>
</body>
</html>

8
restore_db.sh
View File

@@ -77,4 +77,10 @@ docker stop ae_mariadb_maint && docker rm ae_mariadb_maint
echo ">>> Starting MariaDB container normally..." echo ">>> Starting MariaDB container normally..."
docker compose start mariadb docker compose start mariadb
echo "--- Restore and Password Reset Complete! ---" echo "--- Restore and Password Reset Complete! ---"
# 8. Cleanup Safety Snapshot (Only on success)
if [ -n "$BACKUP_DIR" ] && [ -d "$BACKUP_DIR" ]; then
echo ">>> Removing safety snapshot (Restore successful)..."
rm -rf "$BACKUP_DIR"
fi

4
srv/nextcloud/.gitignore vendored
View File

@@ -1,4 +0,0 @@
# Ignore everything in this directory
*
# Except for this file
!.gitignore