diff --git a/images/nginx-ingress/service.conf.tmpl b/images/nginx-ingress/service.conf.tmpl index d015b09..8ddd3bb 100644 --- a/images/nginx-ingress/service.conf.tmpl +++ b/images/nginx-ingress/service.conf.tmpl @@ -93,7 +93,7 @@ server { add_header X-Request-ID $request_id; # Return to client {{#each this.http.paths as |path|}} - {{#if (eq path.pathType "prefix")}} + {{#if (eq path.pathType "Prefix")}} location {{path.path}} { {{> proxyPassLocation path}} diff --git a/manifests/ingress.yaml b/manifests/ingress.yaml index b6162a5..843c168 100644 --- a/manifests/ingress.yaml +++ b/manifests/ingress.yaml @@ -20,9 +20,14 @@ spec: - name: ingress hostPath: path: /var/lib/skate/ingress + - name: le_storage + hostPath: + path: /var/lib/skate/ingress/letsencrypt_storage containers: - name: nginx image: ghcr.io/skateco/nginx-ingress volumeMounts: - mountPath: /var/lib/skate/ingress name: ingress + - mountPath: /etc/resty-auto-ssl/storage + name: le_storage diff --git a/src/create.rs b/src/create.rs index fd8e3a2..91f8e00 100644 --- a/src/create.rs +++ b/src/create.rs @@ -165,7 +165,7 @@ async fn create_node(args: CreateNodeArgs) -> Result<(), Box> { let all_conns = &all_conns.unwrap_or(SshClients { clients: vec!() }); - _ = conn.execute("sudo mkdir -p /var/lib/skate/ingress").await?; + _ = conn.execute("sudo mkdir -p /var/lib/skate/ingress /var/lib/skate/ingress/letsencrypt_storage").await?; // _ = conn.execute("sudo podman rm -fa").await; setup_networking(&conn, &all_conns, &cluster, &node).await?; diff --git a/src/executor.rs b/src/executor.rs index c8ffae8..5a432d7 100644 --- a/src/executor.rs +++ b/src/executor.rs @@ -189,7 +189,7 @@ impl DefaultExecutor { let main_template_data = json!({ "letsEncrypt": { - "endpoint": "https://acme-staging-v02.api.letsencrypt.org/directory", + "endpoint": "", //"https://acme-staging-v02.api.letsencrypt.org/directory", "allowDomains": le_allow_domains }, });