refactor: ubuntu -> framework.ubuntu & extensions -> framework.extensions

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

@@ -1,13 +0,0 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.application
-
-import org.domaindrivenarchitecture.provs.framework.core.Prov
-import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain.installK3sServer
-
-
-/**
- * Performs use case of provisioning a k3s server
- */
-fun Prov.provisionK3s() = task {
-    installK3sServer()
-}
-

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

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

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Utils.kt

@@ -5,7 +5,7 @@ import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerSta
 import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerUbuntuHostProcessor
 import org.domaindrivenarchitecture.provs.framework.core.processors.RemoteProcessor
 import org.domaindrivenarchitecture.provs.framework.core.tags.Api
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileContent
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileContent
 import java.io.File
 import java.net.InetAddress
 

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliUtils.kt

@@ -4,11 +4,11 @@ import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.Secret
 import org.domaindrivenarchitecture.provs.framework.core.local
 import org.domaindrivenarchitecture.provs.framework.core.remote
-import org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources.GopassSecretSource
+import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources.GopassSecretSource
-import org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources.PromptSecretSource
+import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources.PromptSecretSource
-import org.domaindrivenarchitecture.provs.ubuntu.user.base.currentUserCanSudo
+import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.currentUserCanSudo
-import org.domaindrivenarchitecture.provs.ubuntu.user.base.makeUserSudoerWithNoSudoPasswordRequired
+import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.makeUserSudoerWithNoSudoPasswordRequired
-import org.domaindrivenarchitecture.provs.ubuntu.user.base.whoami
+import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.whoami
 import kotlin.system.exitProcess
 
 

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/demos/HelloWorld.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.demos
+package org.domaindrivenarchitecture.provs.framework.extensions.demos
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.local

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/demos/SystemInfos.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.demos
+package org.domaindrivenarchitecture.provs.framework.extensions.demos
 
 import org.domaindrivenarchitecture.provs.framework.core.*
 

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

@@ -0,0 +1,13 @@
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
+
+import org.domaindrivenarchitecture.provs.framework.core.Prov
+import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain.installK3sServer
+
+
+/**
+ * Performs use case of provisioning a k3s server
+ */
+fun Prov.provisionK3s() = task {
+    installK3sServer()
+}
+

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

@@ -1,7 +1,7 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.application
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
 
 import org.domaindrivenarchitecture.provs.framework.core.cli.createProvInstance
-import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain.installK3sAsContainers
+import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain.installK3sAsContainers
 import kotlin.system.exitProcess
 
 

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

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.application
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
 
 import kotlinx.cli.ArgType
 import kotlinx.cli.default

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

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.application
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
 
 import org.domaindrivenarchitecture.provs.framework.core.cli.TargetCliCommand
 

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

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.docker.provideContainer

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

@@ -1,9 +1,9 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
 import org.domaindrivenarchitecture.provs.framework.core.echoCommandForText
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
 
 
 /**

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

@@ -1,11 +1,11 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.infrastructure.apple
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.infrastructure.apple
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
 import org.domaindrivenarchitecture.provs.framework.core.remote
 import org.domaindrivenarchitecture.provs.framework.core.repeatTaskUntilSuccess
-import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain.applyK3sConfig
+import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain.applyK3sConfig
-import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain.installK3sServer
+import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain.installK3sServer
 
 
 /**

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

@@ -1,9 +1,9 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.certbot
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.certbot
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileExists
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileExists
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
 
 
 /**

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

@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.firewall
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.firewall
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
 
 
 fun Prov.saveIpTables() = requireAll {

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

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

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

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

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

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nexus.base
+package org.domaindrivenarchitecture.provs.framework.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/framework/extensions/server_software/standalone_server/nginx/ProvisionNginx.kt

@@ -1,13 +1,13 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
 import org.domaindrivenarchitecture.provs.framework.core.remote
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileExists
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileExists
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.NginxConf
+import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base.NginxConf
-import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.createNginxLocationFolders
+import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base.createNginxLocationFolders
 import kotlin.system.exitProcess
 
 

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/BasicAuth.kt

@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.Secret
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
 
 fun Prov.nginxAddBasicAuth(user: String, password: Secret) = requireAll {
     aptInstall("apache2-utils")

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/Configs.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base
 
 class NginxConf(val conf: String = NGINX_MINIMAL_CONF) {
     companion object {}

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/Locations.kt

@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.*
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.*
 
 
 internal const val locationsAvailableDir = "/etc/nginx/locations-available/"

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/SelfSignedCertificate.kt

@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDirs
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDirs
-import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.provisionNginxStandAlone
+import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.provisionNginxStandAlone
 
 
 internal val certificateName = "selfsigned"

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

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

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

@@ -1,12 +1,12 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.prometheus.base
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileContainsText
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileContainsText
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.replaceTextInFile
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.replaceTextInFile
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.ubuntu.user.base.whoami
+import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.whoami
 
 
 internal val defaultInstallationDir = "/usr/local/bin/"

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

@@ -1,10 +1,10 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.prometheus.base
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.docker.containerRuns
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDirs
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDirs
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
 
 
 internal val configDir = "/etc/prometheus/"

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

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

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/filesystem/base/Filesystem.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.ubuntu.filesystem.base
+package org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base
 
 import org.domaindrivenarchitecture.provs.framework.core.platforms.SHELL
 import org.domaindrivenarchitecture.provs.framework.core.*

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/ProvisionGit.kt

@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.ubuntu.git
+package org.domaindrivenarchitecture.provs.framework.ubuntu.git
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
 
 
 fun Prov.provisionGit(

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/base/Git.kt

@@ -1,10 +1,10 @@
-package org.domaindrivenarchitecture.provs.ubuntu.git.base
+package org.domaindrivenarchitecture.provs.framework.ubuntu.git.base
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.*
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.isHostKnown
-import org.domaindrivenarchitecture.provs.ubuntu.keys.base.isHostKnown
 import org.domaindrivenarchitecture.provs.framework.core.echoCommandForText
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.*
 import java.io.File
 
 val knownHostsFile = "~/.ssh/known_hosts"

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/install/base/Install.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.ubuntu.install.base
+package org.domaindrivenarchitecture.provs.framework.ubuntu.install.base
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/ProvisionKeys.kt

@@ -1,11 +1,11 @@
-package org.domaindrivenarchitecture.provs.ubuntu.keys
+package org.domaindrivenarchitecture.provs.framework.ubuntu.keys
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
 import org.domaindrivenarchitecture.provs.framework.core.Secret
-import org.domaindrivenarchitecture.provs.ubuntu.keys.base.configureGpgKeys
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.configureGpgKeys
-import org.domaindrivenarchitecture.provs.ubuntu.keys.base.configureSshKeys
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.configureSshKeys
-import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSourceType
+import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSourceType
 import kotlinx.serialization.Serializable
 
 

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/Gpg.kt

@@ -1,13 +1,13 @@
-package org.domaindrivenarchitecture.provs.ubuntu.keys.base
+package org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createSecretFile
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createSecretFile
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.dirExists
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.dirExists
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPair
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPair
 import org.domaindrivenarchitecture.provs.framework.core.echoCommandForText
 
 

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/Ssh.kt

@@ -1,10 +1,10 @@
-package org.domaindrivenarchitecture.provs.ubuntu.keys.base
+package org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createSecretFile
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createSecretFile
-import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPair
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPair
 
 
 /**

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/SecretSource.kt

@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.ubuntu.secret
+package org.domaindrivenarchitecture.provs.framework.ubuntu.secret
 
 import org.domaindrivenarchitecture.provs.framework.core.Secret
-import org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources.*
 import kotlinx.serialization.Serializable
+import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources.*
 
 
 @Serializable

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/FileSecretSource.kt

@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources
+package org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.Secret
-import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSource
+import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSource
 
 
 /**

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/GopassSecretSource.kt

@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources
+package org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.Secret
-import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSource
+import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSource
 
 
 /**

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/PassSecretSource.kt

@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources
+package org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.Secret
-import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSource
+import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSource
 
 
 /**

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/PlainSecretSource.kt

@@ -1,7 +1,7 @@
-package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources
+package org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources
 
 import org.domaindrivenarchitecture.provs.framework.core.Secret
-import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSource
+import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSource
 
 
 class PlainSecretSource(plainSecret: String) : SecretSource(plainSecret) {

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/PromptSecretSource.kt

@@ -1,7 +1,7 @@
-package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources
+package org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources
 
 import org.domaindrivenarchitecture.provs.framework.core.Secret
-import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSource
+import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSource
 import java.awt.FlowLayout
 import javax.swing.*
 

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/UserConfig.kt

@@ -0,0 +1,8 @@
+package org.domaindrivenarchitecture.provs.framework.ubuntu.user
+
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPairSource
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+class UserConfig(val userName: String, val gitEmail: String? = null, val gpg: KeyPairSource? = null, val ssh: KeyPairSource? = null)

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/base/User.kt

@@ -1,16 +1,16 @@
-package org.domaindrivenarchitecture.provs.ubuntu.user.base
+package org.domaindrivenarchitecture.provs.framework.ubuntu.user.base
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
 import org.domaindrivenarchitecture.provs.framework.core.Secret
 import org.domaindrivenarchitecture.provs.framework.core.processors.RemoteProcessor
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDirs
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDirs
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileExists
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileExists
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.userHome
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.userHome
-import org.domaindrivenarchitecture.provs.ubuntu.git.provisionGit
+import org.domaindrivenarchitecture.provs.framework.ubuntu.git.provisionGit
-import org.domaindrivenarchitecture.provs.ubuntu.keys.base.gpgFingerprint
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.gpgFingerprint
-import org.domaindrivenarchitecture.provs.ubuntu.keys.provisionKeys
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.provisionKeys
-import org.domaindrivenarchitecture.provs.ubuntu.user.UserConfig
+import org.domaindrivenarchitecture.provs.framework.ubuntu.user.UserConfig
 import java.net.InetAddress
 
 

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/web/base/Web.kt

@@ -1,12 +1,11 @@
-package org.domaindrivenarchitecture.provs.ubuntu.web.base
+package org.domaindrivenarchitecture.provs.framework.ubuntu.web.base
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
 import org.domaindrivenarchitecture.provs.framework.core.tags.Api
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDirs
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDirs
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.deleteFile
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.deleteFile
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.isPackageInstalled
 
 
 /**

src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/user/UserConfig.kt

@@ -1,12 +0,0 @@
-package org.domaindrivenarchitecture.provs.ubuntu.user
-
-import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPairSource
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import java.io.BufferedReader
-import java.io.FileReader
-import java.io.FileWriter
-
-
-@Serializable
-class UserConfig(val userName: String, val gitEmail: String? = null, val gpg: KeyPairSource? = null, val ssh: KeyPairSource? = null)

src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/ProvisionWorkplace.kt

@@ -2,15 +2,15 @@ package org.domaindrivenarchitecture.provs.workplace.domain
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.ubuntu.git.provisionGit
+import org.domaindrivenarchitecture.provs.framework.ubuntu.git.provisionGit
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstallFromPpa
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstallFromPpa
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptPurge
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptPurge
-import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPair
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPair
-import org.domaindrivenarchitecture.provs.ubuntu.keys.base.gpgFingerprint
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.gpgFingerprint
-import org.domaindrivenarchitecture.provs.ubuntu.keys.provisionKeys
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.provisionKeys
-import org.domaindrivenarchitecture.provs.ubuntu.user.base.currentUserCanSudo
+import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.currentUserCanSudo
-import org.domaindrivenarchitecture.provs.ubuntu.user.base.whoami
+import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.whoami
 import org.domaindrivenarchitecture.provs.workplace.infrastructure.*
 
 

src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/WorkplaceConfig.kt

@@ -1,6 +1,6 @@
 package org.domaindrivenarchitecture.provs.workplace.domain
 
-import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPairSource
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPairSource
 import kotlinx.serialization.Serializable
 
 

src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Bash.kt

@@ -2,8 +2,10 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.*
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.addTextToFile
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.dirExists
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
 import java.io.File
 
 

src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOps.kt

@@ -3,9 +3,9 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
 import org.domaindrivenarchitecture.provs.framework.core.local
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.*
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.*
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.ubuntu.web.base.downloadFromURL
+import org.domaindrivenarchitecture.provs.framework.ubuntu.web.base.downloadFromURL
 
 
 fun Prov.installDevOps() = def {

src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Docker.kt

@@ -1,7 +1,7 @@
 package org.domaindrivenarchitecture.provs.workplace.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
 
 fun Prov.installDocker() = def {
     aptInstall("containerd docker.io")

src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Fakturama.kt

@@ -1,8 +1,8 @@
 package org.domaindrivenarchitecture.provs.workplace.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir
-import org.domaindrivenarchitecture.provs.ubuntu.web.base.downloadFromURL
+import org.domaindrivenarchitecture.provs.framework.ubuntu.web.base.downloadFromURL
 
 
 fun Prov.installFakturama() = def {

src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Gopass.kt

@@ -2,10 +2,13 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.*
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDirs
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.isPackageInstalled
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile
-import org.domaindrivenarchitecture.provs.ubuntu.web.base.downloadFromURL
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.userHome
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.isPackageInstalled
+import org.domaindrivenarchitecture.provs.framework.ubuntu.web.base.downloadFromURL
 
 
 fun Prov.installGopass(

src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/GopassBridge.kt

@@ -2,12 +2,12 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDirs
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDirs
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.userHome
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.userHome
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.isPackageInstalled
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.isPackageInstalled
-import org.domaindrivenarchitecture.provs.ubuntu.web.base.downloadFromURL
+import org.domaindrivenarchitecture.provs.framework.ubuntu.web.base.downloadFromURL
 
 
 fun Prov.downloadGopassBridge() = def {

src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/NoSwappiness.kt

@@ -1,7 +1,7 @@
 package org.domaindrivenarchitecture.provs.workplace.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.addTextToFile
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.addTextToFile
 import java.io.File
 
 fun Prov.configureNoSwappiness() = def {

src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Python.kt

@@ -2,7 +2,7 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
 
 
 fun Prov.installPython() = def {

src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Redshift.kt

@@ -1,9 +1,9 @@
 package org.domaindrivenarchitecture.provs.workplace.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
 
 
 fun Prov.installRedshift() = def {

src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCode.kt

@@ -2,8 +2,8 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.isPackageInstalled
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.isPackageInstalled
 
 
 fun Prov.installVSC(vararg options: String) = requireAll {

src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VirtualBoxGuest.kt

@@ -2,8 +2,8 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.ubuntu.user.base.whoami
+import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.whoami
 
 fun Prov.installVirtualBoxGuestAdditions() = def {
     // if running in a VirtualBox vm

src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Zim.kt

@@ -2,9 +2,9 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstallFromPpa
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstallFromPpa
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.isPackageInstalled
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.isPackageInstalled
 
 
 fun Prov.installZimWiki() = def {

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/ProvTest.kt

@@ -1,11 +1,7 @@
-package org.domaindrivenarchitecture.provs.core
+package org.domaindrivenarchitecture.provs.framework.core
 
 import ch.qos.logback.classic.Level
 import org.domaindrivenarchitecture.provs.framework.core.docker.provideContainer
-import org.domaindrivenarchitecture.provs.framework.core.ProgressType
-import org.domaindrivenarchitecture.provs.framework.core.Prov
-import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.framework.core.remote
 import org.domaindrivenarchitecture.provs.test.setRootLoggingLevel
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.domaindrivenarchitecture.provs.test.tags.NonCi

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/TaskFunctionsKtTest.kt

@@ -1,8 +1,5 @@
-package org.domaindrivenarchitecture.provs.core
+package org.domaindrivenarchitecture.provs.framework.core
 
-import org.domaindrivenarchitecture.provs.framework.core.Prov
-import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.framework.core.repeatTaskUntilSuccess
 import org.domaindrivenarchitecture.provs.test.testLocal
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/UtilsKtTest.kt

@@ -1,9 +1,5 @@
-package org.domaindrivenarchitecture.provs.core
+package org.domaindrivenarchitecture.provs.framework.core
 
-import org.domaindrivenarchitecture.provs.framework.core.getCallingMethodName
-import org.domaindrivenarchitecture.provs.framework.core.getLocalFileContent
-import org.domaindrivenarchitecture.provs.framework.core.getResourceAsText
-import org.domaindrivenarchitecture.provs.framework.core.remote
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.junit.jupiter.api.Assertions.*

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliCommandKtTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.core.cli
+package org.domaindrivenarchitecture.provs.framework.core.cli
 
 import io.mockk.every
 import io.mockk.mockkStatic

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/TargetCliCommandTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.core.cli
+package org.domaindrivenarchitecture.provs.framework.core.cli
 
 import org.domaindrivenarchitecture.provs.framework.core.cli.parseTarget
 import org.junit.jupiter.api.Assertions.*

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/platforms/UbuntuHostDockerKtTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.core.docker.platforms
+package org.domaindrivenarchitecture.provs.framework.core.docker.platforms
 
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
 import org.domaindrivenarchitecture.provs.framework.core.docker.containerRuns

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/entry/EntryTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.core.entry
+package org.domaindrivenarchitecture.provs.framework.core.entry
 
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Assertions.assertEquals

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/platformTest/UbuntuProvTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.core.platformTest
+package org.domaindrivenarchitecture.provs.framework.core.platformTest
 
 import org.domaindrivenarchitecture.provs.framework.core.ProgressType
 import org.domaindrivenarchitecture.provs.framework.core.Prov

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerProcessorTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.core.processors
+package org.domaindrivenarchitecture.provs.framework.core.processors
 
 import org.domaindrivenarchitecture.provs.framework.core.newline
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerUbuntuHostProcessorTest.kt

@@ -1,8 +1,6 @@
-package org.domaindrivenarchitecture.provs.core.processors
+package org.domaindrivenarchitecture.provs.framework.core.processors
 
 import org.domaindrivenarchitecture.provs.framework.core.platforms.SHELL
-import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerStartMode
-import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerUbuntuHostProcessor
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.domaindrivenarchitecture.provs.test.testDockerWithSudo
 import org.junit.jupiter.api.Assertions.assertEquals

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/LocalProcessorTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.core.processors
+package org.domaindrivenarchitecture.provs.framework.core.processors
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.escapeAndEncloseByDoubleQuoteForShell

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sCommandKtTest.kt

@@ -1,7 +1,6 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.application
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
 
 import org.junit.jupiter.api.Test
-
 import org.junit.jupiter.api.Assertions.*
 
 internal class CliK3sCommandKtTest {

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliKtTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.application
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
 
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3dKtTest.kt

@@ -1,12 +1,12 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain
 
 import org.domaindrivenarchitecture.provs.framework.core.docker
 import org.domaindrivenarchitecture.provs.framework.core.docker.containerExec
 import org.domaindrivenarchitecture.provs.framework.core.docker.provideContainer
 import org.domaindrivenarchitecture.provs.framework.core.local
 import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerStartMode
-import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.infrastructure.apple.appleConfig
+import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.infrastructure.apple.appleConfig
-import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.infrastructure.apple.checkAppleService
+import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.infrastructure.apple.checkAppleService
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.domaindrivenarchitecture.provs.test.tags.NonCi
 import org.junit.jupiter.api.Assertions.assertTrue

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

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.firewall
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.firewall
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.docker.dockerProvideImage
@@ -10,7 +10,7 @@ import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerSta
 import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerUbuntuHostProcessor
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.domaindrivenarchitecture.provs.test.tags.NonCi
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/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.standalone_server.nexus.provisionNexusWithDocker
+import org.domaindrivenarchitecture.provs.framework.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

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/ProvisionNginxKtTest.kt

@@ -1,12 +1,12 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.NonCi
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.replaceTextInFile
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.replaceTextInFile
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.*
+import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base.*
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileExists
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileExists
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/LocationsKtTest.kt

@@ -1,9 +1,9 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base
+package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base
 
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileContainsText
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileContainsText
-import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.configFile
+import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.configFile
-import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.provisionNginxStandAlone
+import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.provisionNginxStandAlone
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/test_keys/TestKeys.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.ubuntu.keys
+package org.domaindrivenarchitecture.provs.framework.extensions.test_keys
 
 
 fun publicGPGSnakeoilKey(): String {

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/ProvisionWorkplaceKtTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.workplace
+package org.domaindrivenarchitecture.provs.framework.extensions.workplace
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/FakturamaKtTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.workplace.base
+package org.domaindrivenarchitecture.provs.framework.extensions.workplace.base
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassBridgeKtTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.workplace.base
+package org.domaindrivenarchitecture.provs.framework.extensions.workplace.base
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
@@ -9,14 +9,14 @@ import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerSta
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.domaindrivenarchitecture.provs.test.tags.NonCi
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPair
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPair
-import org.domaindrivenarchitecture.provs.ubuntu.keys.base.configureGpgKeys
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.configureGpgKeys
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
-import org.domaindrivenarchitecture.provs.extensions.test_keys.privateGPGSnakeoilKey
+import org.domaindrivenarchitecture.provs.framework.extensions.test_keys.privateGPGSnakeoilKey
-import org.domaindrivenarchitecture.provs.extensions.test_keys.publicGPGSnakeoilKey
+import org.domaindrivenarchitecture.provs.framework.extensions.test_keys.publicGPGSnakeoilKey
 import org.domaindrivenarchitecture.provs.workplace.infrastructure.configureGopassBridgeJsonApi
 import org.domaindrivenarchitecture.provs.workplace.infrastructure.downloadGopassBridge
 import org.domaindrivenarchitecture.provs.workplace.infrastructure.installGopass

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassKtTest.kt

@@ -1,20 +1,20 @@
-package org.domaindrivenarchitecture.provs.extensions.workplace.base
+package org.domaindrivenarchitecture.provs.framework.extensions.workplace.base
 
 import org.domaindrivenarchitecture.provs.framework.core.Secret
 import org.domaindrivenarchitecture.provs.framework.core.remote
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.*
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPair
-import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPair
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.configureGpgKeys
-import org.domaindrivenarchitecture.provs.ubuntu.keys.base.configureGpgKeys
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.gpgFingerprint
-import org.domaindrivenarchitecture.provs.ubuntu.keys.base.gpgFingerprint
+import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources.GopassSecretSource
-import org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources.GopassSecretSource
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
-import org.domaindrivenarchitecture.provs.extensions.test_keys.privateGPGSnakeoilKey
+import org.domaindrivenarchitecture.provs.framework.extensions.test_keys.privateGPGSnakeoilKey
-import org.domaindrivenarchitecture.provs.extensions.test_keys.publicGPGSnakeoilKey
+import org.domaindrivenarchitecture.provs.framework.extensions.test_keys.publicGPGSnakeoilKey
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.*
 import org.domaindrivenarchitecture.provs.workplace.infrastructure.*
 import org.junit.jupiter.api.Assertions.assertFalse
 

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/VSCodeKtTest.kt

@@ -1,6 +1,6 @@
-package org.domaindrivenarchitecture.provs.extensions.workplace.base
+package org.domaindrivenarchitecture.provs.framework.extensions.workplace.base
 
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/filesystem/base/FilesystemKtTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.ubuntu.filesystem.base
+package org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/base/GitKtTest.kt

@@ -1,9 +1,12 @@
-package org.domaindrivenarchitecture.provs.ubuntu.git.base
+package org.domaindrivenarchitecture.provs.framework.ubuntu.git.base
 
+import org.domaindrivenarchitecture.provs.framework.ubuntu.git.base.gitClone
+import org.domaindrivenarchitecture.provs.framework.ubuntu.git.base.trustGithub
+import org.domaindrivenarchitecture.provs.framework.ubuntu.git.base.trustGitlab
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.ubuntu.keys.base.isHostKnown
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.isHostKnown
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/install/base/InstallKtTest.kt

@@ -1,5 +1,7 @@
-package org.domaindrivenarchitecture.provs.ubuntu.install.base
+package org.domaindrivenarchitecture.provs.framework.ubuntu.install.base
 
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstallFromPpa
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.junit.jupiter.api.Assertions.assertTrue

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/ProvisionKeysTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.ubuntu.keys
+package org.domaindrivenarchitecture.provs.framework.ubuntu.keys
 
 import org.domaindrivenarchitecture.provs.framework.core.Secret
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/TestKeys.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.test_keys
+package org.domaindrivenarchitecture.provs.framework.ubuntu.keys
 
 
 fun publicGPGSnakeoilKey(): String {

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/GpgKtTest.kt

@@ -1,14 +1,12 @@
-package org.domaindrivenarchitecture.provs.ubuntu.keys.base
+package org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base
 
-import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.Secret
-import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerStartMode
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPair
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPair
-import org.domaindrivenarchitecture.provs.ubuntu.keys.privateGPGSnakeoilKey
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.privateGPGSnakeoilKey
-import org.domaindrivenarchitecture.provs.ubuntu.keys.publicGPGSnakeoilKey
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.publicGPGSnakeoilKey
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/SshKtTest.kt

@@ -1,9 +1,11 @@
-package org.domaindrivenarchitecture.provs.ubuntu.keys.base
+package org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base
 
 import org.domaindrivenarchitecture.provs.framework.core.Secret
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPair
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.privateSSHSnakeoilKey
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.publicSSHSnakeoilKey
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
-import org.domaindrivenarchitecture.provs.ubuntu.keys.*
 import org.junit.jupiter.api.Test
 
 import org.junit.jupiter.api.Assertions.*

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/PromptSecretSourceTest.kt

@@ -1,5 +1,6 @@
-package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources
+package org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources
 
+import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources.PromptSecretSource
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/ProvisionUserKtTest.kt

@@ -1,16 +1,16 @@
-package org.domaindrivenarchitecture.provs.ubuntu.user
+package org.domaindrivenarchitecture.provs.framework.ubuntu.user
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileContent
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileContent
-import org.domaindrivenarchitecture.provs.ubuntu.keys.*
+import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.*
-import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSourceType
+import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSourceType
-import org.domaindrivenarchitecture.provs.ubuntu.user.base.configureUser
+import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.configureUser
-import org.domaindrivenarchitecture.provs.ubuntu.user.base.createUser
+import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.createUser
-import org.domaindrivenarchitecture.provs.ubuntu.user.base.userExists
+import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.userExists
-import org.domaindrivenarchitecture.provs.ubuntu.user.base.userIsInGroupSudo
+import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.userIsInGroupSudo
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/utils/UtilsKtTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.ubuntu.utils
+package org.domaindrivenarchitecture.provs.framework.ubuntu.utils
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.docker

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/web/base/WebKtTest.kt

@@ -1,10 +1,11 @@
-package org.domaindrivenarchitecture.provs.ubuntu.web.base
+package org.domaindrivenarchitecture.provs.framework.ubuntu.web.base
 
+import org.domaindrivenarchitecture.provs.framework.ubuntu.web.base.downloadFromURL
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileContent
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileContent
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileExists
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileExists
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
 

src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceKtTest.kt

@@ -5,7 +5,7 @@ import io.mockk.every
 import io.mockk.mockkStatic
 import io.mockk.unmockkStatic
 import io.mockk.verify
-import org.domaindrivenarchitecture.provs.core.*
+import org.domaindrivenarchitecture.provs.framework.core.*
 import org.domaindrivenarchitecture.provs.framework.core.cli.retrievePassword
 import org.domaindrivenarchitecture.provs.framework.core.processors.PrintOnlyProcessor
 import org.domaindrivenarchitecture.provs.framework.core.*

src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/ConfigRepositoryKtTest.kt

@@ -1,7 +1,7 @@
 package org.domaindrivenarchitecture.provs.workplace.infrastructure
 
 import com.charleskorn.kaml.InvalidPropertyValueException
-import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSourceType
+import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSourceType
 import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test

src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOpsKtTest.kt

@@ -3,9 +3,9 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure
 import org.domaindrivenarchitecture.provs.framework.core.getResourceAsText
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDirs
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDirs
-import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileContainsText
+import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileContainsText
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 

src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCodeKtTest.kt

@@ -1,7 +1,7 @@
 package org.domaindrivenarchitecture.provs.workplace.infrastructure
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
-import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
+import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
 import org.junit.jupiter.api.Test
 
 import org.junit.jupiter.api.Assertions.*