[skip ci] refactor packages

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_compounds/monitoring/ProvisionMonitoring.kt

@@ -4,8 +4,8 @@ import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.NginxConf
 import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.nginxHttpConf
 import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.provisionNginxStandAlone
-import org.domaindrivenarchitecture.provs.extensions.server_software.prometheus.base.configurePrometheusDocker
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base.configurePrometheusDocker
-import org.domaindrivenarchitecture.provs.extensions.server_software.prometheus.base.runPrometheusDocker
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base.runPrometheusDocker
 
 
 @Suppress("unused") // used externally

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_compounds/monitoring/ProvisionNginxAndMonitoring.kt

@@ -6,8 +6,8 @@ import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.
 import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.nginxCreateSelfSignedCertificate
 import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.nginxHttpsConfWithLocationFiles
 import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.provisionNginxStandAlone
-import org.domaindrivenarchitecture.provs.extensions.server_software.prometheus.base.prometheusNginxConfig
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base.prometheusNginxConfig
-import org.domaindrivenarchitecture.provs.extensions.server_software.prometheus.provisionPrometheusDocker
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.provisionPrometheusDocker
 
 
 @Suppress("unused") // used externally

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/Cli.kt

@@ -0,0 +1,31 @@
+import org.domaindrivenarchitecture.provs.core.remote
+import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.applyK3sConfig
+import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.infrastructure.apple.appleConfig
+import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.infrastructure.apple.checkAppleService
+import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.installK3sServer
+import org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources.PromptSecretSource
+
+fun main() {
+
+    val host = "192.168.56.141"
+    val remoteUser = "usr"
+    val passwordK3sUser = PromptSecretSource("Enter Password").secret()
+
+    val prov = remote(host, remoteUser, passwordK3sUser)
+    //  val prov = local()
+
+    prov.task {
+
+        installK3sServer()
+
+        // print pods for information purpose
+        println(cmd("sudo k3s kubectl get pods --all-namespaces").out)
+
+        applyK3sConfig(appleConfig())
+
+        // print pods for information purpose
+        println(cmd("sudo k3s kubectl get services").out)
+
+        checkAppleService("sudo k3s kubectl")
+    }
+}

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3s.kt

@@ -3,11 +3,7 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.k3s
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.core.ProvResult
 import org.domaindrivenarchitecture.provs.core.echoCommandForText
-import org.domaindrivenarchitecture.provs.core.remote
-import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.apple.appleConfig
-import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.apple.checkAppleService
 import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources.PromptSecretSource
 
 
 /**
@@ -39,30 +35,8 @@ fun Prov.uninstallK3sServer() = task {
 }
 
 
-fun Prov.applyConfig(configAsYaml: String) = task {
+fun Prov.applyK3sConfig(configAsYaml: String) = task {
     cmd(echoCommandForText(configAsYaml) + " | sudo k3s kubectl apply -f -")
 }
 
 
-fun main() {
-
-    val host = "192.168.56.141"
-    val remoteUser = "usr"
-    val passwordK3sUser = PromptSecretSource("Enter Password").secret()
-
-    remote(host, remoteUser, passwordK3sUser).def {
-//    local().task {
-
-        installK3sServer()
-
-        // print pods for information purpose
-        println(cmd("sudo k3s kubectl get pods --all-namespaces").out)
-
-        applyConfig(appleConfig())
-
-        // print pods for information purpose
-        println(cmd("sudo k3s kubectl get services").out)
-
-        checkAppleService("sudo k3s kubectl")
-    }
-}

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/infrastructure/apple/Apple.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.apple
+package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.infrastructure.apple
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.core.ProvResult

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/certbot/ProvisionCertbot.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.certbot
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.certbot
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.core.ProvResult

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/ProvisionFirewall.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.firewall
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.firewall
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.core.ProvResult

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/base/FirewallBackup.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.firewall.base
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.firewall.base
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.core.ProvResult

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/ProvisionNexus.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.nexus
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nexus
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.core.ProvResult
@@ -7,7 +7,7 @@ import org.domaindrivenarchitecture.provs.core.remote
 import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileExists
 import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
 import org.domaindrivenarchitecture.provs.ubuntu.user.base.createUser
-import org.domaindrivenarchitecture.provs.extensions.server_software.certbot.provisionCertbot
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.certbot.provisionCertbot
 import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.NginxConf
 import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.nginxReverseProxyHttpConfig
 import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.provisionNginxStandAlone

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/base/NginxConf.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.nexus.base
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nexus.base
 
 fun reverseProxyConfigHttpPort80(serverName: String): String {
     // see https://help.sonatype.com/repomanager3/installation/run-behind-a-reverse-proxy

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/ProvisionPrometheus.kt

@@ -1,7 +1,7 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.prometheus
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus
 
 import org.domaindrivenarchitecture.provs.core.Prov
-import org.domaindrivenarchitecture.provs.extensions.server_software.prometheus.base.*
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base.*
 
 /**
  * Provisions prometheus monitoring.

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/NodeExporter.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.prometheus.base
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/Prometheus.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.prometheus.base
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.core.docker.containerRuns

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/PrometheusNginxConfig.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.prometheus.base
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base
 
 val prometheusNginxConfig = """
                 proxy_pass http://localhost:9090/prometheus;

src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/ProvisionFirewallKtTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.firewall
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.firewall
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.core.docker.dockerProvideImage

src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/ProvisionNexusKtTest.kt

@@ -1,7 +1,7 @@
 package nexus
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
-import org.domaindrivenarchitecture.provs.extensions.server_software.nexus.provisionNexusWithDocker
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nexus.provisionNexusWithDocker
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test