From 6109323640cf1894be9afc8cdfd4be804e9f7ea3 Mon Sep 17 00:00:00 2001 From: gittestuser Date: Fri, 4 Feb 2022 11:06:12 +0100 Subject: [PATCH] fixed server resource path --- .../domaindrivenarchitecture/provs/server/infrastructure/K3s.kt | 2 +- .../provs/server/infrastructure/network.kt | 2 +- .../provs/{ => server}/infrastructure/k3s/apple.template.yaml | 0 .../provs/{ => server}/infrastructure/k3s/cert-manager.yaml | 0 .../{ => server}/infrastructure/k3s/config.dual.template.yaml | 0 .../{ => server}/infrastructure/k3s/config.ipv4.template.yaml | 0 .../provs/{ => server}/infrastructure/k3s/k3s-install.sh | 0 .../{ => server}/infrastructure/k3s/le-issuer.template.yaml | 0 .../provs/{ => server}/infrastructure/k3s/traefic.yaml | 0 .../infrastructure/network/99-loopback.dual.template.yaml | 0 .../infrastructure/network/99-loopback.ipv4.template.yaml | 0 11 files changed, 2 insertions(+), 2 deletions(-) rename src/main/resources/org/domaindrivenarchitecture/provs/{ => server}/infrastructure/k3s/apple.template.yaml (100%) rename src/main/resources/org/domaindrivenarchitecture/provs/{ => server}/infrastructure/k3s/cert-manager.yaml (100%) rename src/main/resources/org/domaindrivenarchitecture/provs/{ => server}/infrastructure/k3s/config.dual.template.yaml (100%) rename src/main/resources/org/domaindrivenarchitecture/provs/{ => server}/infrastructure/k3s/config.ipv4.template.yaml (100%) rename src/main/resources/org/domaindrivenarchitecture/provs/{ => server}/infrastructure/k3s/k3s-install.sh (100%) rename src/main/resources/org/domaindrivenarchitecture/provs/{ => server}/infrastructure/k3s/le-issuer.template.yaml (100%) rename src/main/resources/org/domaindrivenarchitecture/provs/{ => server}/infrastructure/k3s/traefic.yaml (100%) rename src/main/resources/org/domaindrivenarchitecture/provs/{ => server}/infrastructure/network/99-loopback.dual.template.yaml (100%) rename src/main/resources/org/domaindrivenarchitecture/provs/{ => server}/infrastructure/network/99-loopback.ipv4.template.yaml (100%) diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt index c87a31b..504ebc0 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt @@ -8,7 +8,7 @@ import org.domaindrivenarchitecture.provs.server.domain.CertmanagerEndpoint import org.domaindrivenarchitecture.provs.server.domain.k3s.Certmanager import org.domaindrivenarchitecture.provs.server.domain.k3s.K3sConfig -private const val k3sResourcePath = "org/domaindrivenarchitecture/provs/infrastructure/k3s/" +private const val k3sResourcePath = "org/domaindrivenarchitecture/provs/server/infrastructure/k3s/" private const val k3sManualManifestsDir = "/etc/rancher/k3s/manifests/" private const val k3sAutomatedManifestsDir = "/var/lib/rancher/k3s/server/manifests/" private const val k3sConfigFile = "/etc/rancher/k3s/config.yaml" diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/network.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/network.kt index d4d624a..9799d3b 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/network.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/network.kt @@ -7,7 +7,7 @@ import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileE import org.domaindrivenarchitecture.provs.server.domain.k3s.K3sConfig val loopbackFile = "/etc/netplan/99-loopback.yaml" -val resourcePath = "org/domaindrivenarchitecture/provs/infrastructure/network/" +val resourcePath = "org/domaindrivenarchitecture/provs/server/infrastructure/network/" fun Prov.testNetworkExists(): Boolean { return fileExists(loopbackFile) diff --git a/src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/apple.template.yaml b/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/apple.template.yaml similarity index 100% rename from src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/apple.template.yaml rename to src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/apple.template.yaml diff --git a/src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/cert-manager.yaml b/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/cert-manager.yaml similarity index 100% rename from src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/cert-manager.yaml rename to src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/cert-manager.yaml diff --git a/src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/config.dual.template.yaml b/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/config.dual.template.yaml similarity index 100% rename from src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/config.dual.template.yaml rename to src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/config.dual.template.yaml diff --git a/src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/config.ipv4.template.yaml b/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/config.ipv4.template.yaml similarity index 100% rename from src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/config.ipv4.template.yaml rename to src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/config.ipv4.template.yaml diff --git a/src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/k3s-install.sh b/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/k3s-install.sh similarity index 100% rename from src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/k3s-install.sh rename to src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/k3s-install.sh diff --git a/src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/le-issuer.template.yaml b/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/le-issuer.template.yaml similarity index 100% rename from src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/le-issuer.template.yaml rename to src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/le-issuer.template.yaml diff --git a/src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/traefic.yaml b/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/traefic.yaml similarity index 100% rename from src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/traefic.yaml rename to src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/traefic.yaml diff --git a/src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/network/99-loopback.dual.template.yaml b/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/network/99-loopback.dual.template.yaml similarity index 100% rename from src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/network/99-loopback.dual.template.yaml rename to src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/network/99-loopback.dual.template.yaml diff --git a/src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/network/99-loopback.ipv4.template.yaml b/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/network/99-loopback.ipv4.template.yaml similarity index 100% rename from src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/network/99-loopback.ipv4.template.yaml rename to src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/network/99-loopback.ipv4.template.yaml