From d5a497e6191cefe17b6840bf76369a068f84406e Mon Sep 17 00:00:00 2001 From: leo Date: Sat, 7 Aug 2021 20:00:09 +0200 Subject: [PATCH] refactor imports to org.domaindrivenarchitecture --- .../extensions/demos/HelloWorld.kt | 2 +- .../extensions/demos/SystemInfos.kt | 2 +- .../monitoring/ProvisionMonitoring.kt | 18 +++++++++++++++++ .../monitoring/ProvisionNginxAndMonitoring.kt | 20 +++++++++++++++++++ .../certbot/ProvisionCertbot.kt | 2 +- .../firewall/ProvisionFirewall.kt | 2 +- .../firewall/base/FirewallBackup.kt | 2 +- .../server_software/nexus/ProvisionNexus.kt | 10 +++++----- .../server_software/nexus/base/NginxConf.kt | 2 +- .../server_software/nginx/ProvisionNginx.kt | 6 +++--- .../server_software/nginx/base/BasicAuth.kt | 2 +- .../server_software/nginx/base/Configs.kt | 2 +- .../server_software/nginx/base/Locations.kt | 2 +- .../nginx/base/SelfSignedCertificate.kt | 4 ++-- .../prometheus/ProvisionPrometheus.kt | 4 ++-- .../prometheus/base/NodeExporter.kt | 2 +- .../prometheus/base/Prometheus.kt | 2 +- .../prometheus/base/PrometheusNginxConfig.kt | 2 +- .../workplace/ProvisionWorkplace.kt | 4 ++-- .../extensions/workplace/WorkplaceConfig.kt | 6 +----- .../extensions/workplace/base/Docker.kt | 2 +- .../extensions/workplace/base/Fakturama.kt | 2 +- .../extensions/workplace/base/Gopass.kt | 2 +- .../extensions/workplace/base/GopassBridge.kt | 2 +- .../extensions/workplace/base/NoSwappiness.kt | 2 +- .../workplace/base/PackageBundles.kt | 2 +- .../extensions/workplace/base/Redshift.kt | 2 +- .../extensions/workplace/base/VSCode.kt | 2 +- .../workplace/base/VirtualBoxGuest.kt | 2 +- .../extensions/workplace/base/Zim.kt | 2 +- .../monitoring/ProvisionMonitoring.kt | 18 ----------------- .../monitoring/ProvisionNginxAndMonitoring.kt | 20 ------------------- .../firewall/ProvisionFirewallKtTest.kt | 2 +- .../nexus/ProvisionNexusKtTest.kt | 3 +-- .../nginx/ProvisionNginxKtTest.kt | 4 ++-- .../nginx/base/LocationsKtTest.kt | 6 +++--- .../extensions/test_keys/TestKeys.kt | 2 +- .../workplace/ProvisionWorkplaceKtTest.kt | 2 +- .../workplace/base/FakturamaKtTest.kt | 3 +-- .../workplace/base/GopassBridgeKtTest.kt | 6 +++--- .../extensions/workplace/base/GopassKtTest.kt | 6 +++--- .../extensions/workplace/base/VSCodeKtTest.kt | 2 +- 42 files changed, 92 insertions(+), 98 deletions(-) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/demos/HelloWorld.kt (75%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/demos/SystemInfos.kt (95%) create mode 100644 bin/main/org/domaindrivenarchitecture/provs/extensions/server_compounds/monitoring/ProvisionMonitoring.kt create mode 100644 bin/main/org/domaindrivenarchitecture/provs/extensions/server_compounds/monitoring/ProvisionNginxAndMonitoring.kt rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/certbot/ProvisionCertbot.kt (93%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/firewall/ProvisionFirewall.kt (98%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/firewall/base/FirewallBackup.kt (88%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/nexus/ProvisionNexus.kt (87%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/nexus/base/NginxConf.kt (96%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/nginx/ProvisionNginx.kt (81%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/nginx/base/BasicAuth.kt (82%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/nginx/base/Configs.kt (97%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/nginx/base/Locations.kt (94%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/nginx/base/SelfSignedCertificate.kt (87%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/prometheus/ProvisionPrometheus.kt (77%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/prometheus/base/NodeExporter.kt (96%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/prometheus/base/Prometheus.kt (96%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/prometheus/base/PrometheusNginxConfig.kt (51%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/ProvisionWorkplace.kt (97%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/WorkplaceConfig.kt (75%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/base/Docker.kt (80%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/base/Fakturama.kt (90%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/base/Gopass.kt (97%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/base/GopassBridge.kt (98%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/base/NoSwappiness.kt (79%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/base/PackageBundles.kt (87%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/base/Redshift.kt (90%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/base/VSCode.kt (96%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/base/VirtualBoxGuest.kt (92%) rename bin/main/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/base/Zim.kt (88%) delete mode 100644 bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_compounds/monitoring/ProvisionMonitoring.kt delete mode 100644 bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_compounds/monitoring/ProvisionNginxAndMonitoring.kt rename bin/test/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/firewall/ProvisionFirewallKtTest.kt (95%) rename bin/test/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/nexus/ProvisionNexusKtTest.kt (76%) rename bin/test/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/nginx/ProvisionNginxKtTest.kt (92%) rename bin/test/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/server_software/nginx/base/LocationsKtTest.kt (79%) rename bin/test/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/test_keys/TestKeys.kt (99%) rename bin/test/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/ProvisionWorkplaceKtTest.kt (95%) rename bin/test/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/base/FakturamaKtTest.kt (72%) rename bin/test/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/base/GopassBridgeKtTest.kt (94%) rename bin/test/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/base/GopassKtTest.kt (92%) rename bin/test/org/domaindrivenarchitecture/provs/{ubuntu => }/extensions/workplace/base/VSCodeKtTest.kt (90%) diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/demos/HelloWorld.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/demos/HelloWorld.kt similarity index 75% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/demos/HelloWorld.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/demos/HelloWorld.kt index 38c17dd..8b3b7d8 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/demos/HelloWorld.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/demos/SystemInfos.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/demos/SystemInfos.kt similarity index 95% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/demos/SystemInfos.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/demos/SystemInfos.kt index 3859fb1..2488d52 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/demos/SystemInfos.kt +++ b/bin/main/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.* diff --git a/bin/main/org/domaindrivenarchitecture/provs/extensions/server_compounds/monitoring/ProvisionMonitoring.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/server_compounds/monitoring/ProvisionMonitoring.kt new file mode 100644 index 0000000..8c85888 --- /dev/null +++ b/bin/main/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()) +} + + diff --git a/bin/main/org/domaindrivenarchitecture/provs/extensions/server_compounds/monitoring/ProvisionNginxAndMonitoring.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/server_compounds/monitoring/ProvisionNginxAndMonitoring.kt new file mode 100644 index 0000000..9320da8 --- /dev/null +++ b/bin/main/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) +} + diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/certbot/ProvisionCertbot.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/certbot/ProvisionCertbot.kt similarity index 93% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/certbot/ProvisionCertbot.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/certbot/ProvisionCertbot.kt index edffb3b..ad66362 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/certbot/ProvisionCertbot.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/firewall/ProvisionFirewall.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/firewall/ProvisionFirewall.kt similarity index 98% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/firewall/ProvisionFirewall.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/firewall/ProvisionFirewall.kt index 6697463..1cc8ed2 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/firewall/ProvisionFirewall.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/firewall/base/FirewallBackup.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/firewall/base/FirewallBackup.kt similarity index 88% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/firewall/base/FirewallBackup.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/firewall/base/FirewallBackup.kt index 558b555..f4b6068 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/firewall/base/FirewallBackup.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nexus/ProvisionNexus.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/nexus/ProvisionNexus.kt similarity index 87% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nexus/ProvisionNexus.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/nexus/ProvisionNexus.kt index 27b1a6b..5a2f65f 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nexus/ProvisionNexus.kt +++ b/bin/main/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.ubuntu.extensions.server_software.nginx.base.NginxConf -import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.base.nginxReverseProxyHttpConfig -import org.domaindrivenarchitecture.provs.ubuntu.extensions.server_software.nginx.provisionNginxStandAlone +import org.domaindrivenarchitecture.provs.extensions.server_software.certbot.provisionCertbot +import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.NginxConf +import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.nginxReverseProxyHttpConfig +import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.provisionNginxStandAlone /** diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nexus/base/NginxConf.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/nexus/base/NginxConf.kt similarity index 96% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nexus/base/NginxConf.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/nexus/base/NginxConf.kt index e9adf04..25e3b58 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nexus/base/NginxConf.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/ProvisionNginx.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/ProvisionNginx.kt similarity index 81% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/ProvisionNginx.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/ProvisionNginx.kt index 0c0e25e..51714ad 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/ProvisionNginx.kt +++ b/bin/main/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.ubuntu.extensions.server_software.nginx.base.createNginxLocationFolders +import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.NginxConf +import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.createNginxLocationFolders import kotlin.system.exitProcess diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/base/BasicAuth.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/BasicAuth.kt similarity index 82% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/base/BasicAuth.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/BasicAuth.kt index ce692c1..d9d48d2 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/base/BasicAuth.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/base/Configs.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/Configs.kt similarity index 97% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/base/Configs.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/Configs.kt index 97199d9..40be12d 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/base/Configs.kt +++ b/bin/main/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 {} diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/base/Locations.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/Locations.kt similarity index 94% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/base/Locations.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/Locations.kt index dbe2bc5..cf14cc7 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/base/Locations.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/base/SelfSignedCertificate.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/SelfSignedCertificate.kt similarity index 87% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/base/SelfSignedCertificate.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/SelfSignedCertificate.kt index 5b6a469..196aad7 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/base/SelfSignedCertificate.kt +++ b/bin/main/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" diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/prometheus/ProvisionPrometheus.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/prometheus/ProvisionPrometheus.kt similarity index 77% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/prometheus/ProvisionPrometheus.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/prometheus/ProvisionPrometheus.kt index 9f33e83..d138fb0 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/prometheus/ProvisionPrometheus.kt +++ b/bin/main/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. diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/prometheus/base/NodeExporter.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/prometheus/base/NodeExporter.kt similarity index 96% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/prometheus/base/NodeExporter.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/prometheus/base/NodeExporter.kt index ad7450f..be205d4 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/prometheus/base/NodeExporter.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/prometheus/base/Prometheus.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/prometheus/base/Prometheus.kt similarity index 96% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/prometheus/base/Prometheus.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/prometheus/base/Prometheus.kt index 42008c4..5b3fea4 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/prometheus/base/Prometheus.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/prometheus/base/PrometheusNginxConfig.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/prometheus/base/PrometheusNginxConfig.kt similarity index 51% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/prometheus/base/PrometheusNginxConfig.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/server_software/prometheus/base/PrometheusNginxConfig.kt index e4e1b39..39fdb22 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/prometheus/base/PrometheusNginxConfig.kt +++ b/bin/main/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; diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/ProvisionWorkplace.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplace.kt similarity index 97% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/ProvisionWorkplace.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplace.kt index 2cfb720..c5146c4 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/ProvisionWorkplace.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/WorkplaceConfig.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/WorkplaceConfig.kt similarity index 75% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/WorkplaceConfig.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/WorkplaceConfig.kt index 1dd0c94..de75195 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/WorkplaceConfig.kt +++ b/bin/main/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.* diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/Docker.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/Docker.kt similarity index 80% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/Docker.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/Docker.kt index 80fab6f..1892f4f 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/Docker.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/Fakturama.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/Fakturama.kt similarity index 90% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/Fakturama.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/Fakturama.kt index 4f34429..06a9440 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/Fakturama.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/Gopass.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/Gopass.kt similarity index 97% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/Gopass.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/Gopass.kt index 3ec54c3..c5050fd 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/Gopass.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/GopassBridge.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassBridge.kt similarity index 98% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/GopassBridge.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassBridge.kt index 83d4188..92f1531 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/GopassBridge.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/NoSwappiness.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/NoSwappiness.kt similarity index 79% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/NoSwappiness.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/NoSwappiness.kt index 23bc485..ba63836 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/NoSwappiness.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/PackageBundles.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/PackageBundles.kt similarity index 87% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/PackageBundles.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/PackageBundles.kt index 49997dc..2d9e984 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/PackageBundles.kt +++ b/bin/main/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" diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/Redshift.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/Redshift.kt similarity index 90% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/Redshift.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/Redshift.kt index 0c8950f..8541da4 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/Redshift.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/VSCode.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/VSCode.kt similarity index 96% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/VSCode.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/VSCode.kt index 1a92d8d..fc70a3d 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/VSCode.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/VirtualBoxGuest.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/VirtualBoxGuest.kt similarity index 92% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/VirtualBoxGuest.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/VirtualBoxGuest.kt index 6bd96be..45763d6 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/VirtualBoxGuest.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/Zim.kt b/bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/Zim.kt similarity index 88% rename from bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/Zim.kt rename to bin/main/org/domaindrivenarchitecture/provs/extensions/workplace/base/Zim.kt index 42d3f4a..1c4295a 100644 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/Zim.kt +++ b/bin/main/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 diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_compounds/monitoring/ProvisionMonitoring.kt b/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_compounds/monitoring/ProvisionMonitoring.kt deleted file mode 100644 index 958dea5..0000000 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_compounds/monitoring/ProvisionMonitoring.kt +++ /dev/null @@ -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()) -} - - diff --git a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_compounds/monitoring/ProvisionNginxAndMonitoring.kt b/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_compounds/monitoring/ProvisionNginxAndMonitoring.kt deleted file mode 100644 index b19b98e..0000000 --- a/bin/main/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_compounds/monitoring/ProvisionNginxAndMonitoring.kt +++ /dev/null @@ -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) -} - diff --git a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/firewall/ProvisionFirewallKtTest.kt b/bin/test/org/domaindrivenarchitecture/provs/extensions/server_software/firewall/ProvisionFirewallKtTest.kt similarity index 95% rename from bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/firewall/ProvisionFirewallKtTest.kt rename to bin/test/org/domaindrivenarchitecture/provs/extensions/server_software/firewall/ProvisionFirewallKtTest.kt index 05e1327..8014d3f 100644 --- a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/firewall/ProvisionFirewallKtTest.kt +++ b/bin/test/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 diff --git a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nexus/ProvisionNexusKtTest.kt b/bin/test/org/domaindrivenarchitecture/provs/extensions/server_software/nexus/ProvisionNexusKtTest.kt similarity index 76% rename from bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nexus/ProvisionNexusKtTest.kt rename to bin/test/org/domaindrivenarchitecture/provs/extensions/server_software/nexus/ProvisionNexusKtTest.kt index 5ea4387..797f472 100644 --- a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nexus/ProvisionNexusKtTest.kt +++ b/bin/test/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 { diff --git a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/ProvisionNginxKtTest.kt b/bin/test/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/ProvisionNginxKtTest.kt similarity index 92% rename from bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/ProvisionNginxKtTest.kt rename to bin/test/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/ProvisionNginxKtTest.kt index 9e47975..a020a35 100644 --- a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/ProvisionNginxKtTest.kt +++ b/bin/test/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 diff --git a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/base/LocationsKtTest.kt b/bin/test/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/LocationsKtTest.kt similarity index 79% rename from bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/base/LocationsKtTest.kt rename to bin/test/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/LocationsKtTest.kt index a1a387d..e1e1a24 100644 --- a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/server_software/nginx/base/LocationsKtTest.kt +++ b/bin/test/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.ubuntu.extensions.server_software.nginx.provisionNginxStandAlone +import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.configFile +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 diff --git a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/test_keys/TestKeys.kt b/bin/test/org/domaindrivenarchitecture/provs/extensions/test_keys/TestKeys.kt similarity index 99% rename from bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/test_keys/TestKeys.kt rename to bin/test/org/domaindrivenarchitecture/provs/extensions/test_keys/TestKeys.kt index d85811a..8e66bcb 100644 --- a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/test_keys/TestKeys.kt +++ b/bin/test/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 { diff --git a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/ProvisionWorkplaceKtTest.kt b/bin/test/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplaceKtTest.kt similarity index 95% rename from bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/ProvisionWorkplaceKtTest.kt rename to bin/test/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplaceKtTest.kt index 38f4f6e..752a210 100644 --- a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/ProvisionWorkplaceKtTest.kt +++ b/bin/test/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 diff --git a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/FakturamaKtTest.kt b/bin/test/org/domaindrivenarchitecture/provs/extensions/workplace/base/FakturamaKtTest.kt similarity index 72% rename from bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/FakturamaKtTest.kt rename to bin/test/org/domaindrivenarchitecture/provs/extensions/workplace/base/FakturamaKtTest.kt index 73e81fe..4d3e47a 100644 --- a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/FakturamaKtTest.kt +++ b/bin/test/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 diff --git a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/GopassBridgeKtTest.kt b/bin/test/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassBridgeKtTest.kt similarity index 94% rename from bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/GopassBridgeKtTest.kt rename to bin/test/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassBridgeKtTest.kt index 8b8f79f..7add4bc 100644 --- a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/GopassBridgeKtTest.kt +++ b/bin/test/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.ubuntu.extensions.test_keys.publicGPGSnakeoilKey +import org.domaindrivenarchitecture.provs.extensions.test_keys.privateGPGSnakeoilKey +import org.domaindrivenarchitecture.provs.extensions.test_keys.publicGPGSnakeoilKey internal class GopassBridgeKtTest { diff --git a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/GopassKtTest.kt b/bin/test/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassKtTest.kt similarity index 92% rename from bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/GopassKtTest.kt rename to bin/test/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassKtTest.kt index 46a62cf..98880b9 100644 --- a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/GopassKtTest.kt +++ b/bin/test/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.ubuntu.extensions.test_keys.publicGPGSnakeoilKey +import org.domaindrivenarchitecture.provs.extensions.test_keys.privateGPGSnakeoilKey +import org.domaindrivenarchitecture.provs.extensions.test_keys.publicGPGSnakeoilKey internal class GopassKtTest { diff --git a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/VSCodeKtTest.kt b/bin/test/org/domaindrivenarchitecture/provs/extensions/workplace/base/VSCodeKtTest.kt similarity index 90% rename from bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/VSCodeKtTest.kt rename to bin/test/org/domaindrivenarchitecture/provs/extensions/workplace/base/VSCodeKtTest.kt index 493cae7..8e22383 100644 --- a/bin/test/org/domaindrivenarchitecture/provs/ubuntu/extensions/workplace/base/VSCodeKtTest.kt +++ b/bin/test/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