diff --git a/alpine/template b/alpine/template index f9b4b0a..96f29ac 100755 --- a/alpine/template +++ b/alpine/template @@ -7,7 +7,7 @@ fi host_vars_dir="/app/host_vars" -keys=(NEBULA_CA API_KEY HOSTNAME NEBULA_CRT NEBULA_KEY SSH_PRIVATE SSH_PUBLIC PROVIDER CONTRACT_END COST) +keys=(NEBULA_CA API_KEY HOSTNAME NEBULA_CRT NEBULA_KEY SSH_PRIVATE SSH_PUBLIC) NEBULA_CA=$(<"$host_vars_dir/ca.crt") diff --git a/app/sbin/audit b/app/sbin/audit index 6ee80e1..d06110d 100755 --- a/app/sbin/audit +++ b/app/sbin/audit @@ -36,36 +36,9 @@ def read_file(path): return None -def read_env_file(path): - """Parse a KEY=value env file (optionally quoted) into a dict.""" - env = {} - try: - with open(path) as f: - for line in f: - line = line.strip() - if not line or line.startswith("#") or "=" not in line: - continue - if line.startswith("export "): - line = line[len("export ") :].strip() - key, value = line.split("=", 1) - value = value.strip() - if len(value) >= 2 and value[0] == value[-1] and value[0] in "\"'": - value = value[1:-1] - env[key.strip()] = value - except (FileNotFoundError, PermissionError): - pass - return env - - def main(): audit = {} - # Provider / contract info (API_KEY is intentionally not exposed) - server_env = read_env_file("/etc/4server") - audit["PROVIDER"] = server_env.get("PROVIDER") - audit["CONTRACT_END"] = server_env.get("CONTRACT_END") - audit["COST"] = server_env.get("COST") - # Container identity audit["container_id"] = os.environ.get("HOSTNAME") diff --git a/app/sbin/start/n8n b/app/sbin/start/n8n index 464e7b4..0e07922 100755 --- a/app/sbin/start/n8n +++ b/app/sbin/start/n8n @@ -4,7 +4,7 @@ # Get the hostname of the machine HOSTNAME=$(hostname) -echo "$(date '+%Y-%m-%d %H:%M:%S') START N8N UUID=${UUID} HOST=${HOSTNAME} DOMAIN=${UUID}.odoo4projects.com DOMAIN2=${UUID}.${HOSTNAME}.odoo4projects.com" +echo "$(date '+%Y-%m-%d %H:%M:%S') START N8N UUID=${UUID} HOST=${HOSTNAME} DOMAIN=${UUID}.odoo4projects.com" mkdir -p /4server/data/${UUID}/n8n mkdir -p /4server/data/${UUID}/data @@ -53,7 +53,7 @@ docker run -d \ -v "/4server/data/${UUID}/data:/data" \ -v "/4server/data/${UUID}/backup:/backup" \ --label "traefik.enable=true" \ - --label "traefik.http.routers.${UUID}.rule=Host(\`${UUID}.odoo4projects.com\`) || Host(\`${UUID}.${HOSTNAME}.odoo4projects.com\`)" \ + --label "traefik.http.routers.${UUID}.rule=Host(\`${UUID}.odoo4projects.com\`)" \ --label "traefik.http.routers.${UUID}.entrypoints=web,websecure" \ --label "traefik.http.routers.${UUID}.tls=true" \ --label "traefik.http.routers.${UUID}.tls.certresolver=production" \ diff --git a/app/vault/host_vars.img b/app/vault/host_vars.img index c1f9f19..cd17597 100644 Binary files a/app/vault/host_vars.img and b/app/vault/host_vars.img differ