diff --git a/LXC_archive/management/gitea.yml b/LXC_archive/management/gitea.yml index 756672d..228f582 100644 --- a/LXC_archive/management/gitea.yml +++ b/LXC_archive/management/gitea.yml @@ -1,51 +1,51 @@ services: gitea-postgres: image: docker.io/library/postgres:15 - container_name: ${SERVICE_NAME}-postgres environment: - POSTGRES_USER=${GITEA_DB_USERNAME} - POSTGRES_PASSWORD=${GITEA_DB_PASSWORD} - - POSTGRES_DB=${SERVICE_NAME} + - POSTGRES_DB=gitea volumes: - /docker/management/gitea-postgres/postgres:/var/lib/postgresql/data + container_name: gitea-postgres + labels: + - "komodo.skip=true" restart: unless-stopped + ports: + - "5433:5432" networks: - - internal_net + - management_internal gitea: image: gitea/gitea:latest - container_name: ${SERVICE_NAME} - restart: unless-stopped - depends_on: - - ${SERVICE_NAME}-postgres + container_name: gitea + ports: + - "3002:3000" + - "222:22" networks: - - internal_net - - external_net + - management_internal + - gitea_external volumes: - - /docker/management/${SERVICE_NAME}:/data + - /docker/management/gitea:/data + - /docker/management/gitea-postgres:/var/lib/gitea - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro + - /docker:/docker + - ./empty:/var/empty environment: - - TZ=${TZ} - - GITEA__actions__ENABLED=true + - TZ=America/Edmonton + - ROOT_URL=${GITEA_ROOT_URL} - GITEA__database__DB_TYPE=postgres - - GITEA__database__HOST=${SERVICE_NAME}-postgres:5432 - - GITEA__database__NAME=${SERVICE_NAME} - - GITEA__server__ROOT_URL=${GITEA_PROTOCOL}://${GITEA_FQDN} + - GITEA__database__HOST=gitea-postgres:5432 + - GITEA__database__NAME=gitea - GITEA__database__USER=${GITEA_DB_USERNAME} - GITEA__database__PASSWD=${GITEA_DB_PASSWORD} - labels: - - "traefik.enable=true" - - "traefik.http.routers.${SERVICE_NAME}.rule=Host(`${GITEA_FQDN}`)" - - "traefik.http.routers.${SERVICE_NAME}.entrypoints=${TRAEFIK_ENTRYPOINT}" - - "traefik.http.routers.${SERVICE_NAME}.tls.certresolver=${TRAEFIK_RESOLVER}" - - "traefik.http.services.${SERVICE_NAME}.loadbalancer.server.port=${GITEA_INTERNAL_PORT}" - - "traefik.docker.network=gitea_external" + restart: unless-stopped + depends_on: + - gitea-postgres networks: - internal_net: - name: ${GITEA_INTERNAL_NETWORK_NAME} - driver: bridge - external_net: - name: ${GITEA_EXTERNAL_NETWORK_NAME} - driver: bridge \ No newline at end of file + management_internal: + internal: true + gitea_external: + external: true \ No newline at end of file diff --git a/LXC_archive/management/gitea.yml.bak0 b/LXC_archive/management/gitea.yml.bak0 new file mode 100644 index 0000000..756672d --- /dev/null +++ b/LXC_archive/management/gitea.yml.bak0 @@ -0,0 +1,51 @@ +services: + gitea-postgres: + image: docker.io/library/postgres:15 + container_name: ${SERVICE_NAME}-postgres + environment: + - POSTGRES_USER=${GITEA_DB_USERNAME} + - POSTGRES_PASSWORD=${GITEA_DB_PASSWORD} + - POSTGRES_DB=${SERVICE_NAME} + volumes: + - /docker/management/gitea-postgres/postgres:/var/lib/postgresql/data + restart: unless-stopped + networks: + - internal_net + + gitea: + image: gitea/gitea:latest + container_name: ${SERVICE_NAME} + restart: unless-stopped + depends_on: + - ${SERVICE_NAME}-postgres + networks: + - internal_net + - external_net + volumes: + - /docker/management/${SERVICE_NAME}:/data + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + environment: + - TZ=${TZ} + - GITEA__actions__ENABLED=true + - GITEA__database__DB_TYPE=postgres + - GITEA__database__HOST=${SERVICE_NAME}-postgres:5432 + - GITEA__database__NAME=${SERVICE_NAME} + - GITEA__server__ROOT_URL=${GITEA_PROTOCOL}://${GITEA_FQDN} + - GITEA__database__USER=${GITEA_DB_USERNAME} + - GITEA__database__PASSWD=${GITEA_DB_PASSWORD} + labels: + - "traefik.enable=true" + - "traefik.http.routers.${SERVICE_NAME}.rule=Host(`${GITEA_FQDN}`)" + - "traefik.http.routers.${SERVICE_NAME}.entrypoints=${TRAEFIK_ENTRYPOINT}" + - "traefik.http.routers.${SERVICE_NAME}.tls.certresolver=${TRAEFIK_RESOLVER}" + - "traefik.http.services.${SERVICE_NAME}.loadbalancer.server.port=${GITEA_INTERNAL_PORT}" + - "traefik.docker.network=gitea_external" + +networks: + internal_net: + name: ${GITEA_INTERNAL_NETWORK_NAME} + driver: bridge + external_net: + name: ${GITEA_EXTERNAL_NETWORK_NAME} + driver: bridge \ No newline at end of file diff --git a/lxc1/p0-infrastructure/mgdb.yml b/LXC_archive/mgdb.yml similarity index 100% rename from lxc1/p0-infrastructure/mgdb.yml rename to LXC_archive/mgdb.yml diff --git a/lxc1/p0-infrastructure/mgdb/01_deploy_mgdb_dbs.sh b/LXC_archive/mgdb/01_deploy_mgdb_dbs.sh similarity index 100% rename from lxc1/p0-infrastructure/mgdb/01_deploy_mgdb_dbs.sh rename to LXC_archive/mgdb/01_deploy_mgdb_dbs.sh diff --git a/lxc1/p2-apps/pre-wildcard-forgejo.bak0 b/LXC_archive/pre-wildcard-forgejo.bak0 similarity index 100% rename from lxc1/p2-apps/pre-wildcard-forgejo.bak0 rename to LXC_archive/pre-wildcard-forgejo.bak0 diff --git a/lxc1/p2-apps/gitea.yml b/lxc1/p2-apps/gitea.yml deleted file mode 100644 index 228f582..0000000 --- a/lxc1/p2-apps/gitea.yml +++ /dev/null @@ -1,51 +0,0 @@ -services: - gitea-postgres: - image: docker.io/library/postgres:15 - environment: - - POSTGRES_USER=${GITEA_DB_USERNAME} - - POSTGRES_PASSWORD=${GITEA_DB_PASSWORD} - - POSTGRES_DB=gitea - volumes: - - /docker/management/gitea-postgres/postgres:/var/lib/postgresql/data - container_name: gitea-postgres - labels: - - "komodo.skip=true" - restart: unless-stopped - ports: - - "5433:5432" - networks: - - management_internal - - gitea: - image: gitea/gitea:latest - container_name: gitea - ports: - - "3002:3000" - - "222:22" - networks: - - management_internal - - gitea_external - volumes: - - /docker/management/gitea:/data - - /docker/management/gitea-postgres:/var/lib/gitea - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - - /docker:/docker - - ./empty:/var/empty - environment: - - TZ=America/Edmonton - - ROOT_URL=${GITEA_ROOT_URL} - - GITEA__database__DB_TYPE=postgres - - GITEA__database__HOST=gitea-postgres:5432 - - GITEA__database__NAME=gitea - - GITEA__database__USER=${GITEA_DB_USERNAME} - - GITEA__database__PASSWD=${GITEA_DB_PASSWORD} - restart: unless-stopped - depends_on: - - gitea-postgres - -networks: - management_internal: - internal: true - gitea_external: - external: true \ No newline at end of file diff --git a/lxc1/p2-apps/guacamole.yml b/lxc1/p2-apps/guacamole.yml index 4f603cb..9abddd7 100644 --- a/lxc1/p2-apps/guacamole.yml +++ b/lxc1/p2-apps/guacamole.yml @@ -16,14 +16,14 @@ services: restart: always user: root ports: - - 8081:8080 + - 8079:8080 cpus: 2.0 mem_limit: "3072m" # 3 GB mem_reservation: "1024m" environment: - GUACD_HOSTNAME=${GUACD_NAME} - MYSQL_HOSTNAME=${GUAC_DB_HOST} - - MYSQL_PORT=3306 + - MYSQL_PORT=${GUAC_DB_PORT} - MYSQL_DATABASE=${GUAC_DB_NAME} - MYSQL_USER=${GUAC_DB_USER} - MYSQL_PASSWORD=${GUAC_DB_PASS} diff --git a/~host-setups/SQL_DB_VMs/DB_Setup.sh b/~host-setups/SQL_DB_VMs/DB_Setup.sh index 821f134..158fcbb 100644 --- a/~host-setups/SQL_DB_VMs/DB_Setup.sh +++ b/~host-setups/SQL_DB_VMs/DB_Setup.sh @@ -23,3 +23,22 @@ CREATE USER 'fj_dev'@'%' IDENTIFIED BY 'FJPASS2026Dev!' GRANT ALL PRIVILEGES ON fj_dev.* TO 'fj_dev'@'%'; FLUSH PRIVILEGES; +##Guacamole Prod +CREATE DATABASE guac_prod CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +CREATE USER 'guac_prod'@'%' IDENTIFIED BY 'GuacPASS2026Prod!'; +GRANT ALL PRIVILEGES ON guac_prod.* TO 'guac_prod'@'%'; +FLUSH PRIVILEGES; + +##Guacamole Test +CREATE DATABASE guac_test CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +CREATE USER 'guac_test'@'%' IDENTIFIED BY 'GuacPASS2026Test!'; +GRANT ALL PRIVILEGES ON guac_test.* TO 'guac_test'@'%'; +FLUSH PRIVILEGES; + +##Guacamole Dev +CREATE DATABASE guac_dev CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +CREATE USER 'guac_dev'@'%' IDENTIFIED BY 'GuacPASS2026Dev!' + WITH MAX_QUERIES_PER_HOUR 1000 + MAX_UPDATES_PER_HOUR 500; +GRANT ALL PRIVILEGES ON guac_dev.* TO 'guac_dev'@'%'; +FLUSH PRIVILEGES; \ No newline at end of file