Merge branch 'master' of gitlab.com:domaindrivenarchitecture/provs-core

build.gradle

@@ -17,7 +17,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'kotlinx-serialization'
 
 
-group = 'io.provs'
+group = 'org.domaindrivenarchitecture.provs'
 version = '0.8.14-SNAPSHOT'
 
 repositories {
@@ -78,7 +78,7 @@ task fatJar(type: Jar) {
     manifest {
         attributes 'Implementation-Title': 'Gradle Jar File Example',
                 'Implementation-Version': project.version,
-                'Main-Class': 'io.provs.core.entry.EntryKt'
+                'Main-Class': 'org.domaindrivenarchitecture.provs.core.entry.EntryKt'
     }
     archivesBaseName = project.name + '-all'
     duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
@@ -98,7 +98,7 @@ task fatJarLatest(type: Jar) {
     manifest {
         attributes 'Implementation-Title': 'Gradle Jar File Example',
                 'Implementation-Version': project.version,
-                'Main-Class': 'io.provs.core.entry.EntryKt'
+                'Main-Class': 'org.domaindrivenarchitecture.provs.core.entry.EntryKt'
     }
     with jar
     archiveFileName = 'provs-fat-latest.jar'
@@ -120,7 +120,7 @@ task uberJar(type: Jar) {
     manifest {
         attributes 'Implementation-Title': 'Gradle Jar File Example',
                 'Implementation-Version': project.version,
-                'Main-Class': 'io.provs.core.entry.EntryKt'
+                'Main-Class': 'org.domaindrivenarchitecture.provs.core.entry.EntryKt'
     }
     archiveClassifier = 'uber'
 }
@@ -141,7 +141,7 @@ task uberJarLatest(type: Jar) {
     manifest {
         attributes 'Implementation-Title': 'Gradle Jar File Example',
                 'Implementation-Version': project.version,
-                'Main-Class': 'io.provs.core.entry.EntryKt'
+                'Main-Class': 'org.domaindrivenarchitecture.provs.core.entry.EntryKt'
     }
     archiveFileName = 'provs-latest.jar'
 }

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'provs-core'
+rootProject.name = 'provs'

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

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

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

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

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

@@ -0,0 +1,18 @@
+package org.domaindrivenarchitecture.provs.extensions.server_compounds.monitoring
+
+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.prometheus.base.runPrometheusDocker
+
+
+@Suppress("unused") // used externally
+fun Prov.provisionMonitoring() = requireAll {
+    configurePrometheusDocker()
+    runPrometheusDocker()
+    provisionNginxStandAlone(NginxConf.nginxHttpConf())
+}
+
+

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

@@ -0,0 +1,20 @@
+package org.domaindrivenarchitecture.provs.extensions.server_compounds.monitoring
+
+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.nginxAddLocation
+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.prometheus.provisionPrometheusDocker
+
+
+@Suppress("unused") // used externally
+fun Prov.provisionNginxMonitoring(nginxHost: String = "localhost") = def {
+    provisionPrometheusDocker(nginxHost)
+    nginxCreateSelfSignedCertificate()
+    provisionNginxStandAlone(NginxConf.nginxHttpsConfWithLocationFiles())
+    nginxAddLocation("443", nginxHost, "/prometheus", prometheusNginxConfig)
+}
+

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nexus
+package org.domaindrivenarchitecture.provs.extensions.server_software.nexus
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.core.ProvResult
@@ -7,10 +7,10 @@ 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.ubuntu.extensions.server_software.certbot.provisionCertbot
+import org.domaindrivenarchitecture.provs.extensions.server_software.certbot.provisionCertbot
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.base.NginxConf
+import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.NginxConf
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.base.nginxReverseProxyHttpConfig
+import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.nginxReverseProxyHttpConfig
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.provisionNginxStandAlone
+import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.provisionNginxStandAlone
 
 
 /**

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

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

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

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

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.base
+package org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.core.Secret

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.prometheus.base
+package org.domaindrivenarchitecture.provs.extensions.server_software.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/prometheus/base/Prometheus.kt

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

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

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

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

@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.ubuntu.extensions.workplace
+package org.domaindrivenarchitecture.provs.extensions.workplace
 
 import org.domaindrivenarchitecture.provs.core.*
 import org.domaindrivenarchitecture.provs.core.processors.RemoteProcessor
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.workplace.base.*
+import org.domaindrivenarchitecture.provs.extensions.workplace.base.*
 import org.domaindrivenarchitecture.provs.ubuntu.git.provisionGit
 import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
 import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstallFromPpa

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

@@ -1,10 +1,6 @@
-package org.domaindrivenarchitecture.provs.ubuntu.extensions.workplace
+package org.domaindrivenarchitecture.provs.extensions.workplace
 
 import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPairSource
-import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSource
-import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSourceType
-import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSupplier
-import org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources.PlainSecretSource
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import java.io.*

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/Docker.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.ubuntu.extensions.workplace.base
+package org.domaindrivenarchitecture.provs.extensions.workplace.base
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/Fakturama.kt

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

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/Gopass.kt

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

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassBridge.kt

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

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/NoSwappiness.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.ubuntu.extensions.workplace.base
+package org.domaindrivenarchitecture.provs.extensions.workplace.base
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.addTextToFile

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/PackageBundles.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.ubuntu.extensions.workplace.base
+package org.domaindrivenarchitecture.provs.extensions.workplace.base
 
 val OS_ANALYSIS = "lsof strace ncdu iptraf htop iotop iftop"
 

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/Redshift.kt

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

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/VSCode.kt

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

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/VirtualBoxGuest.kt

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

src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/Zim.kt

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

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

@@ -1,18 +0,0 @@
-package org.domaindrivenarchitecture.provs.ubuntu.extensions.server_compounds.monitoring
-
-import org.domaindrivenarchitecture.provs.core.Prov
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.base.NginxConf
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.base.nginxHttpConf
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.provisionNginxStandAlone
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.prometheus.base.configurePrometheusDocker
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.prometheus.base.runPrometheusDocker
-
-
-@Suppress("unused") // used externally
-fun Prov.provisionMonitoring() = requireAll {
-    configurePrometheusDocker()
-    runPrometheusDocker()
-    provisionNginxStandAlone(NginxConf.nginxHttpConf())
-}
-
-

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

@@ -1,20 +0,0 @@
-package org.domaindrivenarchitecture.provs.ubuntu.extensions.server_compounds.monitoring
-
-import org.domaindrivenarchitecture.provs.core.Prov
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.base.NginxConf
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.base.nginxAddLocation
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.base.nginxCreateSelfSignedCertificate
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.base.nginxHttpsConfWithLocationFiles
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.provisionNginxStandAlone
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.prometheus.base.prometheusNginxConfig
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.prometheus.provisionPrometheusDocker
-
-
-@Suppress("unused") // used externally
-fun Prov.provisionNginxMonitoring(nginxHost: String = "localhost") = def {
-    provisionPrometheusDocker(nginxHost)
-    nginxCreateSelfSignedCertificate()
-    provisionNginxStandAlone(NginxConf.nginxHttpsConfWithLocationFiles())
-    nginxAddLocation("443", nginxHost, "/prometheus", prometheusNginxConfig)
-}
-

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

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

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

@@ -1,11 +1,10 @@
 package nexus
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nexus.provisionNexusWithDocker
+import org.domaindrivenarchitecture.provs.extensions.server_software.nexus.provisionNexusWithDocker
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
-import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 
 internal class ProvisionNexusKtTest {
 

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

@@ -1,10 +1,10 @@
-package org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx
+package org.domaindrivenarchitecture.provs.extensions.server_software.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.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.base.*
+import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.*
 import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileExists
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test

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

@@ -1,9 +1,9 @@
-package org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.base
+package org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base
 
 import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile
 import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileContainsText
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.configFile
+import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.configFile
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.provisionNginxStandAlone
+import org.domaindrivenarchitecture.provs.extensions.server_software.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/extensions/test_keys/TestKeys.kt

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

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

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.ubuntu.extensions.workplace
+package org.domaindrivenarchitecture.provs.extensions.workplace
 
 import org.domaindrivenarchitecture.provs.core.Password
 import org.junit.jupiter.api.Assertions.assertTrue

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

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

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

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.ubuntu.extensions.workplace.base
+package org.domaindrivenarchitecture.provs.extensions.workplace.base
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.core.ProvResult
@@ -15,8 +15,8 @@ import org.domaindrivenarchitecture.provs.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.ubuntu.extensions.test_keys.privateGPGSnakeoilKey
+import org.domaindrivenarchitecture.provs.extensions.test_keys.privateGPGSnakeoilKey
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.test_keys.publicGPGSnakeoilKey
+import org.domaindrivenarchitecture.provs.extensions.test_keys.publicGPGSnakeoilKey
 
 
 internal class GopassBridgeKtTest {

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

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.ubuntu.extensions.workplace.base
+package org.domaindrivenarchitecture.provs.extensions.workplace.base
 
 import org.domaindrivenarchitecture.provs.core.Secret
 import org.domaindrivenarchitecture.provs.core.remote
@@ -13,8 +13,8 @@ import org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources.GopassSecr
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.test_keys.privateGPGSnakeoilKey
+import org.domaindrivenarchitecture.provs.extensions.test_keys.privateGPGSnakeoilKey
-import org.domaindrivenarchitecture.provs.ubuntu.extensions.test_keys.publicGPGSnakeoilKey
+import org.domaindrivenarchitecture.provs.extensions.test_keys.publicGPGSnakeoilKey
 
 
 internal class GopassKtTest {

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

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