diff --git a/.gitmodules b/.gitmodules index d7c6479b..8a790669 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,6 @@ [submodule "LDAP/LDAPServer"] path = LDAP/LDAPServer url = https://github.com/mieweb/LDAPServer.git -[submodule "ci-cd automation/Proxmox-Launchpad"] - path = ci-cd automation/Proxmox-Launchpad - url = https://github.com/maxklema/proxmox-launchpad.git +[submodule "ci-cd-automation/Proxmox-Launchpad"] + path = ci-cd-automation/Proxmox-Launchpad + url = https://github.com/maxklema/proxmox-launchpad.git diff --git a/README.md b/README.md index 7fec6147..81e0cf09 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,12 @@ graph TD REPO[opensource-mieweb Repository] %% All Main Folders - REPO --> CICD[ci-cd automation] - REPO --> CC[container creation] - REPO --> DNS[dnsmasq service] + REPO --> CICD[ci-cd-automation] + REPO --> CC[container-creation] + REPO --> DNS[dnsmasq-service] REPO --> GW[gateway] REPO --> LDAP[LDAP] - REPO --> NGINX[nginx reverse proxy] + REPO --> NGINX[nginx-reverse-proxy] REPO --> PL[proxmox-launchpad] %% Core Workflow Connections @@ -57,10 +57,10 @@ graph TD ### Core Infrastructure -- [`dnsmasq service/`](dnsmasq%20service/): +- [`dnsmasq-service/`](dnsmasq-service/): Contains Dnsmasq configuration for DHCP and DNS services, including wildcard routing for the reverse proxy and container network management. -- [`nginx reverse proxy/`](nginx%20reverse%20proxy/): +- [`nginx-reverse-proxy/`](nginx-reverse-proxy/): Houses NGINX configuration files for the reverse proxy setup, including JavaScript modules for dynamic backend resolution and SSL certificate management. - [`gateway/`](gateway/): @@ -68,10 +68,10 @@ graph TD ### Container Management -- [`container creation/`](container%20creation/): +- [`container-creation/`](container-creation/): Contains comprehensive scripts for LXC container lifecycle management, including creation, LDAP configuration, service deployment, and registration with the proxy infrastructure. -- [`ci-cd automation/`](ci-cd%20automation/): +- [`ci-cd-automation/`](ci-cd-automation/): Automation scripts for continuous integration and deployment workflows, including container existence checks, updates, and cleanup operations with helper utilities. ### Authentication & Directory Services diff --git a/ci-cd automation/Proxmox-Launchpad b/ci-cd automation/Proxmox-Launchpad deleted file mode 160000 index 038aff5a..00000000 --- a/ci-cd automation/Proxmox-Launchpad +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 038aff5ad0eacd9f77935ae8819ab59da13fc981 diff --git a/ci-cd-automation/Proxmox-Launchpad b/ci-cd-automation/Proxmox-Launchpad new file mode 160000 index 00000000..f40fdacd --- /dev/null +++ b/ci-cd-automation/Proxmox-Launchpad @@ -0,0 +1 @@ +Subproject commit f40fdacd8503fc4e609bf112d804ddfb0988e4ba diff --git a/ci-cd automation/README.md b/ci-cd-automation/README.md similarity index 100% rename from ci-cd automation/README.md rename to ci-cd-automation/README.md diff --git a/ci-cd automation/check-container-exists.sh b/ci-cd-automation/check-container-exists.sh similarity index 100% rename from ci-cd automation/check-container-exists.sh rename to ci-cd-automation/check-container-exists.sh diff --git a/ci-cd automation/delete-container.sh b/ci-cd-automation/delete-container.sh similarity index 100% rename from ci-cd automation/delete-container.sh rename to ci-cd-automation/delete-container.sh diff --git a/ci-cd automation/helper-scripts/PVE_user_authentication.sh b/ci-cd-automation/helper-scripts/PVE_user_authentication.sh similarity index 100% rename from ci-cd automation/helper-scripts/PVE_user_authentication.sh rename to ci-cd-automation/helper-scripts/PVE_user_authentication.sh diff --git a/ci-cd automation/helper-scripts/create-template.sh b/ci-cd-automation/helper-scripts/create-template.sh similarity index 100% rename from ci-cd automation/helper-scripts/create-template.sh rename to ci-cd-automation/helper-scripts/create-template.sh diff --git a/ci-cd automation/helper-scripts/delete-runner.sh b/ci-cd-automation/helper-scripts/delete-runner.sh similarity index 100% rename from ci-cd automation/helper-scripts/delete-runner.sh rename to ci-cd-automation/helper-scripts/delete-runner.sh diff --git a/ci-cd automation/helper-scripts/repository_status.sh b/ci-cd-automation/helper-scripts/repository_status.sh similarity index 100% rename from ci-cd automation/helper-scripts/repository_status.sh rename to ci-cd-automation/helper-scripts/repository_status.sh diff --git a/ci-cd automation/helper-scripts/verify_container_ownership.sh b/ci-cd-automation/helper-scripts/verify_container_ownership.sh similarity index 100% rename from ci-cd automation/helper-scripts/verify_container_ownership.sh rename to ci-cd-automation/helper-scripts/verify_container_ownership.sh diff --git a/ci-cd automation/update-container.sh b/ci-cd-automation/update-container.sh similarity index 100% rename from ci-cd automation/update-container.sh rename to ci-cd-automation/update-container.sh diff --git a/container creation/README.md b/container-creation/README.md similarity index 100% rename from container creation/README.md rename to container-creation/README.md diff --git a/container creation/configureLDAP.sh b/container-creation/configureLDAP.sh similarity index 100% rename from container creation/configureLDAP.sh rename to container-creation/configureLDAP.sh diff --git a/container creation/create-container.sh b/container-creation/create-container.sh similarity index 100% rename from container creation/create-container.sh rename to container-creation/create-container.sh diff --git a/container creation/deployOnStart.sh b/container-creation/deployOnStart.sh similarity index 100% rename from container creation/deployOnStart.sh rename to container-creation/deployOnStart.sh diff --git a/container creation/deployment-scripts/gatherEnvVars.sh b/container-creation/deployment-scripts/gatherEnvVars.sh similarity index 100% rename from container creation/deployment-scripts/gatherEnvVars.sh rename to container-creation/deployment-scripts/gatherEnvVars.sh diff --git a/container creation/deployment-scripts/gatherRuntimeLangs.sh b/container-creation/deployment-scripts/gatherRuntimeLangs.sh similarity index 100% rename from container creation/deployment-scripts/gatherRuntimeLangs.sh rename to container-creation/deployment-scripts/gatherRuntimeLangs.sh diff --git a/container creation/deployment-scripts/gatherServices.sh b/container-creation/deployment-scripts/gatherServices.sh similarity index 100% rename from container creation/deployment-scripts/gatherServices.sh rename to container-creation/deployment-scripts/gatherServices.sh diff --git a/container creation/deployment-scripts/gatherSetupCommands.sh b/container-creation/deployment-scripts/gatherSetupCommands.sh similarity index 100% rename from container creation/deployment-scripts/gatherSetupCommands.sh rename to container-creation/deployment-scripts/gatherSetupCommands.sh diff --git a/container creation/get-deployment-details.sh b/container-creation/get-deployment-details.sh similarity index 100% rename from container creation/get-deployment-details.sh rename to container-creation/get-deployment-details.sh diff --git a/container creation/get-lxc-container-details.sh b/container-creation/get-lxc-container-details.sh similarity index 100% rename from container creation/get-lxc-container-details.sh rename to container-creation/get-lxc-container-details.sh diff --git a/container creation/js/authenticateRepo.js b/container-creation/js/authenticateRepo.js similarity index 100% rename from container creation/js/authenticateRepo.js rename to container-creation/js/authenticateRepo.js diff --git a/container creation/js/authenticateUser.js b/container-creation/js/authenticateUser.js similarity index 100% rename from container creation/js/authenticateUser.js rename to container-creation/js/authenticateUser.js diff --git a/container creation/js/runner.js b/container-creation/js/runner.js similarity index 100% rename from container creation/js/runner.js rename to container-creation/js/runner.js diff --git a/container creation/protocols/master_protocol_list.txt b/container-creation/protocols/master_protocol_list.txt similarity index 100% rename from container creation/protocols/master_protocol_list.txt rename to container-creation/protocols/master_protocol_list.txt diff --git a/container creation/register-container.sh b/container-creation/register-container.sh similarity index 100% rename from container creation/register-container.sh rename to container-creation/register-container.sh diff --git a/container creation/services/service_map_debian.json b/container-creation/services/service_map_debian.json similarity index 100% rename from container creation/services/service_map_debian.json rename to container-creation/services/service_map_debian.json diff --git a/container creation/services/service_map_rocky.json b/container-creation/services/service_map_rocky.json similarity index 100% rename from container creation/services/service_map_rocky.json rename to container-creation/services/service_map_rocky.json diff --git a/container creation/setup-runner.sh b/container-creation/setup-runner.sh similarity index 100% rename from container creation/setup-runner.sh rename to container-creation/setup-runner.sh diff --git a/container creation/ssh/detectPublicKey.sh b/container-creation/ssh/detectPublicKey.sh similarity index 100% rename from container creation/ssh/detectPublicKey.sh rename to container-creation/ssh/detectPublicKey.sh diff --git a/container creation/ssh/publicKeyAppendJumpHost.sh b/container-creation/ssh/publicKeyAppendJumpHost.sh similarity index 100% rename from container creation/ssh/publicKeyAppendJumpHost.sh rename to container-creation/ssh/publicKeyAppendJumpHost.sh diff --git a/container creation/start_services.sh b/container-creation/start_services.sh similarity index 100% rename from container creation/start_services.sh rename to container-creation/start_services.sh diff --git a/dnsmasq service/README.md b/dnsmasq-service/README.md similarity index 100% rename from dnsmasq service/README.md rename to dnsmasq-service/README.md diff --git a/dnsmasq service/dnsmasq.conf b/dnsmasq-service/dnsmasq.conf similarity index 100% rename from dnsmasq service/dnsmasq.conf rename to dnsmasq-service/dnsmasq.conf diff --git a/nginx reverse proxy/README.md b/nginx-reverse-proxy/README.md similarity index 100% rename from nginx reverse proxy/README.md rename to nginx-reverse-proxy/README.md diff --git a/nginx reverse proxy/nginx.conf b/nginx-reverse-proxy/nginx.conf similarity index 100% rename from nginx reverse proxy/nginx.conf rename to nginx-reverse-proxy/nginx.conf diff --git a/nginx reverse proxy/port_map.js b/nginx-reverse-proxy/port_map.js similarity index 100% rename from nginx reverse proxy/port_map.js rename to nginx-reverse-proxy/port_map.js diff --git a/nginx reverse proxy/reverse_proxy.conf b/nginx-reverse-proxy/reverse_proxy.conf similarity index 100% rename from nginx reverse proxy/reverse_proxy.conf rename to nginx-reverse-proxy/reverse_proxy.conf