diff --git a/core/.gitignore b/core/.gitignore new file mode 100644 index 0000000..4c49bd7 --- /dev/null +++ b/core/.gitignore @@ -0,0 +1 @@ +.env diff --git a/core/caddy/config/Caddyfile b/core/caddy/config/Caddyfile index 2435e96..b902fc2 100644 --- a/core/caddy/config/Caddyfile +++ b/core/caddy/config/Caddyfile @@ -1,5 +1,5 @@ { - local_certs + #local_certs default_bind 0.0.0.0 } diff --git a/core/caddy/config/sites/outils.caddy b/core/caddy/config/sites/outils.caddy index 6b64372..848c80e 100644 --- a/core/caddy/config/sites/outils.caddy +++ b/core/caddy/config/sites/outils.caddy @@ -29,7 +29,6 @@ outils.chatons.duckdns.org { } basic_auth /secretpage { - # username "towel" password "poisson" towel $2a$14$/cfdN3/kWYwiw/OeAtLcjOxj/NFZa3gUxqePMSoNh1VmoDzS1BP5S } handle_path /secretpage { diff --git a/core/duckdns/compose.yml b/core/duckdns/compose.yml index b0e2445..fb589aa 100644 --- a/core/duckdns/compose.yml +++ b/core/duckdns/compose.yml @@ -7,5 +7,5 @@ services: PGID: "1000" TZ: "Europe/Paris" SUBDOMAINS: "chatons" - TOKEN: "7b3c8e72-17b9-4b80-a81b-628d1e74127e" + TOKEN: "${DUCKDNS_TOKEN}" restart: always diff --git a/core/git/compose.yml b/core/git/compose.yml index 35ef74f..1f3bd2e 100644 --- a/core/git/compose.yml +++ b/core/git/compose.yml @@ -9,7 +9,7 @@ services: GITEA__database__HOST: gitea-postgres:5432 GITEA__database__NAME: gitea GITEA__database__USER: gitea - GITEA__database__PASSWD: gitea + GITEA__database__PASSWD: ${GITEA_DB_PASSWD} networks: - proxy restart: unless-stopped @@ -30,7 +30,7 @@ services: - proxy environment: - POSTGRES_USER=gitea - - POSTGRES_PASSWORD=gitea + - POSTGRES_PASSWORD=${GITEA_POSTGRES_PASSWORD} - POSTGRES_DB=gitea volumes: diff --git a/core/keycloak/compose.yml b/core/keycloak/compose.yml index 8abc049..80c95f0 100644 --- a/core/keycloak/compose.yml +++ b/core/keycloak/compose.yml @@ -10,12 +10,11 @@ services: KC_DB: postgres KC_DB_URL: jdbc:postgresql://postgres:3212/keycloak KC_DB_USERNAME: bapasqui - KC_DB_PASSWORD: password - KC_BOOTSTRAP_ADMIN_USERNAME: admin - KC_BOOTSTRAP_ADMIN_PASSWORD: admin - KC_HOSTNAME_PORT: 8081 - KC_PROXY: edge - command: + KC_DB_PASSWORD: ${KC_DB_PASSWORD} + KC_BOOTSTRAP_ADMIN_USERNAME: ${KC_BOOTSTRAP_ADMIN_USERNAME} + KC_BOOTSTRAP_ADMIN_PASSWORD: ${KC_BOOTSTRAP_ADMIN_PASSWORD} + KC_HOSTNAME: https://keycloak.chatons.duckdns.org + command: - start-dev restart: unless-stopped diff --git a/core/postgresql/compose.yml b/core/postgresql/compose.yml index 8b1511c..b82a7e0 100644 --- a/core/postgresql/compose.yml +++ b/core/postgresql/compose.yml @@ -6,7 +6,7 @@ services: - proxy environment: POSTGRES_USER: bapasqui - POSTGRES_PASSWORD: password + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} PGPORT: 3212 POSTGRES_DB: keycloak restart: unless-stopped diff --git a/core/tools/push-git.sh b/core/tools/push-git.sh new file mode 100644 index 0000000..db79e76 --- /dev/null +++ b/core/tools/push-git.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +cd ../ +cp -r * core/ +cd core +git init + +git add . +git commit -m " Update files to the repo" +git remote add origin https://vogsphere.chatons.duckdns.org/marvin/core.git +git push -u origin main \ No newline at end of file diff --git a/startup b/startup index e0e844d..de36f6c 100755 --- a/startup +++ b/startup @@ -39,18 +39,18 @@ case "$1" in ;; clean) just clean duckdns - just clean caddy + #just clean caddy just clean doh just clean postgresql - just clean keycloak - just clean git + #just clean keycloak + #just clean git ;; restart) just re duckdns - just re caddy + #just re caddy just re doh just re postgresql - just re git - just re keycloak + #just re git + #just re keycloak ;; esac \ No newline at end of file