diff --git a/.gitignore b/.gitignore
index 8d06017..e901629 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,6 +67,8 @@ environment/
*.bak
*.kate-swp
.directory
+archives/
+archives_and_old/
backups/
bak/
downloads/
@@ -82,8 +84,9 @@ logs/apache2/
logs/mailman2/
# logs/php7/
# logs/web/
-tmp/
+old/
temp/
+tmp/
# OSIT and Aether specific:
diff --git a/docker-compose.yml b/docker-compose.yml
index 04ef0a0..bb52d39 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,6 +54,7 @@ services:
restart: always
image: mariadb:10.11
container_name: ae_mariadb_dev
+ profiles: ["database"]
command: [
"mysqld",
"--max-connections=${MARIADB_MAX_CONNECTIONS}",
@@ -68,6 +69,8 @@ services:
MYSQL_DATABASE: ${AE_DB_NAME}
MYSQL_USER: ${AE_DB_USERNAME}
MYSQL_PASSWORD: ${AE_DB_PASSWORD}
+ ports:
+ - "${AE_DB_EXTERNAL_PORT}:3306"
volumes:
- ./srv/mariadb:/var/lib/mysql
- ./conf/mariadb/server.cnf:/etc/mysql/conf.d/server.cnf
@@ -81,6 +84,7 @@ services:
restart: always
image: phpmyadmin/phpmyadmin
container_name: ae_pma_dev
+ profiles: ["database"]
environment:
PMA_HOST: mariadb
UPLOAD_LIMIT: 64M
@@ -120,7 +124,6 @@ services:
- ./temp/ae_api:/temp
depends_on:
- redis
- - mariadb
stdin_open: true
tty: true
logging:
@@ -129,6 +132,8 @@ services:
max-size: "10m"
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:
# ... (same as before) ...
restart: always
@@ -182,6 +187,7 @@ services:
container_name: ae_ops_dev
image: alpine:latest
restart: always
+ profiles: ["database"]
env_file:
- ./.env
volumes:
diff --git a/env.default b/env.default
index f2f0f2e..e0ee605 100644
--- a/env.default
+++ b/env.default
@@ -8,6 +8,8 @@
TZ=US/Eastern
OSIT_ENV=development
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_WEB=ae_web_default
@@ -44,11 +46,19 @@ DOCKER_OSIT_SERVER_NAME=example-docker.oneskyit.com
# ------------------------------------------------------------------------------
# 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_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_USERNAME=osit_aether
AE_DB_PASSWORD="your-password-here"
+AE_DB_ROOT_PASSWORD="mariadb-root-password-here"
# Connection Tuning
AE_DB_CONNECTION_TIMEOUT=15
diff --git a/html_php/index.html b/html_php/index.html
new file mode 100644
index 0000000..e4bdd20
--- /dev/null
+++ b/html_php/index.html
@@ -0,0 +1,44 @@
+
+
+
+
+
+ Aether Workstation Dashboard
+
+
+
+
+
Aether Dev Environment
+
+
+ Workstation Mode • Arch Linux
+
+
Running with Docker Compose
+
+
+
+
+
+
+
diff --git a/restore_db.sh b/restore_db.sh
index dbe57a3..708e0a1 100755
--- a/restore_db.sh
+++ b/restore_db.sh
@@ -77,4 +77,10 @@ docker stop ae_mariadb_maint && docker rm ae_mariadb_maint
echo ">>> Starting MariaDB container normally..."
docker compose start mariadb
-echo "--- Restore and Password Reset Complete! ---"
\ No newline at end of file
+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
\ No newline at end of file
diff --git a/srv/nextcloud/.gitignore b/srv/nextcloud/.gitignore
deleted file mode 100644
index 9ce0361..0000000
--- a/srv/nextcloud/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except for this file
-!.gitignore
\ No newline at end of file