From 343e8600994b4a8824cdf4e9454ebbdbf0262bde Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Fri, 5 Jul 2024 13:51:47 -0400 Subject: [PATCH] testing docker_templates --- systems/jeeves-jr/docker/web.nix | 2 +- systems/jeeves/docker/web.nix | 4 ++-- systems/jeeves/vars.nix | 1 - .../file_server/sites/000-default.conf | 17 +++++++++++++++++ 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 users/richie/global/docker_templates/file_server/sites/000-default.conf diff --git a/systems/jeeves-jr/docker/web.nix b/systems/jeeves-jr/docker/web.nix index a42a6a4..31349eb 100644 --- a/systems/jeeves-jr/docker/web.nix +++ b/systems/jeeves-jr/docker/web.nix @@ -6,7 +6,7 @@ in arch_mirror = { image = "ubuntu/apache2:latest"; volumes = [ - "${vars.main_docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/" + "${../../../users/richie/global/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/" "/ZFS/Main/Mirror/:/data" ]; ports = [ "800:80" ]; diff --git a/systems/jeeves/docker/web.nix b/systems/jeeves/docker/web.nix index d2dd23c..ed8ce3a 100644 --- a/systems/jeeves/docker/web.nix +++ b/systems/jeeves/docker/web.nix @@ -14,7 +14,7 @@ in dnd_file_server = { image = "ubuntu/apache2:latest"; volumes = [ - "${vars.media_docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/" + "${../../../users/richie/global/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/" "${vars.storage_main}/Table_Top/:/data" ]; extraOptions = [ "--network=web" ]; @@ -23,7 +23,7 @@ in arch_mirror = { image = "ubuntu/apache2:latest"; volumes = [ - "${vars.media_docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/" + "${../../../users/richie/global/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/" "${vars.media_mirror}:/data" ]; ports = [ "800:80" ]; diff --git a/systems/jeeves/vars.nix b/systems/jeeves/vars.nix index b283fce..707170f 100644 --- a/systems/jeeves/vars.nix +++ b/systems/jeeves/vars.nix @@ -9,7 +9,6 @@ in media_database = "${zfs_media}/syncthing/database"; media_docker = "${zfs_media}/docker"; media_docker_configs = "${zfs_media}/docker/configs"; - media_docker_templates = "${zfs_media}/docker/templates"; media_mirror = "${zfs_media}/mirror"; media_notes = "${zfs_media}/notes"; media_plex = "${zfs_media}/plex/"; diff --git a/users/richie/global/docker_templates/file_server/sites/000-default.conf b/users/richie/global/docker_templates/file_server/sites/000-default.conf new file mode 100644 index 0000000..06c715a --- /dev/null +++ b/users/richie/global/docker_templates/file_server/sites/000-default.conf @@ -0,0 +1,17 @@ + + ServerAdmin admin@domain.com + + DocumentRoot /data/ + + Options Indexes FollowSymLinks + AllowOverride All + Require all granted + + + ErrorLog ${APACHE_LOG_DIR}/error.log + + # Possible values include: debug, info, notice, warn, error, crit, alert, emerg. + LogLevel warn + + CustomLog ${APACHE_LOG_DIR}/access.log combined + \ No newline at end of file