applications/_base.nix

@@ -9,9 +9,24 @@ with lib; let
   cfg = config.services.skynet;
 in {
   imports = [
+    # every server needs to have a dns record
+    ./dns/dns.nix
+
+    # every server should have proper certs
     ./acme.nix
-    ../dns/dns.nix
     ./nginx.nix
+
+    # every server may need the firewall config stuff
+    ./firewall.nix
+
+    # every server needs teh ldap client for admins
+    ./ldap/client.nix
+
+    # every server will need the config to backup to
+    ./restic.nix
+
+    # every server will be monitored for grafana
+    ./prometheus.nix
   ];
 
   options.services.skynet = {

applications/_retired/games.nix

@@ -10,7 +10,6 @@ with lib; let
   cfg = config.services.skynet."${name}";
 in {
   imports = [
-    ./dns.nix
     ./nginx.nix
     ./games/minecraft.nix
   ];

applications/_retired/games/minecraft.nix

@@ -13,10 +13,6 @@ with lib; let
   short_domain = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}";
 in {
   imports = [
-    ../acme.nix
-    ../dns.nix
-    ../firewall.nix
-    ../nginx.nix
     inputs.arion.nixosModules.arion
   ];
 

applications/bitwarden/vaultwarden.nix

@@ -13,9 +13,6 @@ with lib; let
   domain = "${domain_sub}.skynet.ie";
 in {
   imports = [
-    ../acme.nix
-    ../dns.nix
-    ../nginx.nix
   ];
 
   options.services.skynet."${name}" = {

applications/dns/dns.nix

@@ -291,7 +291,6 @@
     else "ns2";
 in {
   imports = [
-    ../firewall.nix
     ../../config/dns.nix
   ];
 

applications/email.nix

@@ -120,9 +120,6 @@ with lib; let
     '';
 in {
   imports = [
-    ./dns.nix
-    ./acme.nix
-    ./nginx.nix
     inputs.simple-nixos-mailserver.nixosModule
 
     # for teh config

applications/gitlab.nix

@@ -12,10 +12,6 @@ with lib; let
   domain_full = "${cfg.domain.sub}.${domain_base}";
 in {
   imports = [
-    ./acme.nix
-    ./dns.nix
-    ./firewall.nix
-    ./nginx.nix
   ];
 
   options.services.skynet."${name}" = {

applications/grafana.nix

@@ -9,8 +9,6 @@ with lib; let
   port = 4444;
 in {
   imports = [
-    ./acme.nix
-    ./dns.nix
   ];
 
   options.services.skynet."${name}" = {

applications/ldap/backend.nix

@@ -11,9 +11,6 @@ with lib; let
   port_backend = "8087";
 in {
   imports = [
-    ../acme.nix
-    ../dns.nix
-    ../nginx.nix
     inputs.skynet_ldap_backend.nixosModule."x86_64-linux"
     ../../config/users.nix
   ];

applications/ldap/server.nix

@@ -15,9 +15,6 @@ with lib; let
 in {
   # these are needed for teh program in question
   imports = [
-    ../acme.nix
-    ../dns.nix
-    ../nginx.nix
   ];
 
   options.services.skynet."${name}" = {

applications/nextcloud.nix

@@ -10,9 +10,6 @@ with lib; let
   domain = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}";
 in {
   imports = [
-    ./acme.nix
-    ./dns.nix
-    ./nginx.nix
   ];
 
   options.services.skynet."${name}" = {

applications/nix_cache/nix_cache.nix

@@ -24,8 +24,6 @@ with lib; let
 in {
   imports = [
     inputs.attic.nixosModules.atticd
-    ../acme.nix
-    ../dns.nix
   ];
 
   options.services.skynet."${name}" = {

applications/open_governance/keyserver.nix

@@ -13,8 +13,6 @@ with lib; let
   port = 11371;
 in {
   imports = [
-    ../acme.nix
-    ../dns.nix
   ];
 
   options.services.skynet."${name}" = {

applications/open_governance/open_governance.nix

@@ -15,8 +15,6 @@ with lib; let
   folder = "/var/skynet/${name}";
 in {
   imports = [
-    ../acme.nix
-    ../dns.nix
   ];
 
   options.services.skynet."${name}" = {

applications/skynet_users.nix

@@ -11,9 +11,6 @@ with lib; let
   php_pool = name;
 in {
   imports = [
-    ./acme.nix
-    ./dns.nix
-    ./nginx.nix
   ];
 
   options.services.skynet."${name}" = {

applications/ulfm.nix

@@ -9,10 +9,6 @@ with lib; let
   cfg = config.services.skynet."${name}";
 in {
   imports = [
-    ./acme.nix
-    ./dns.nix
-    ./firewall.nix
-    ./nginx.nix
   ];
 
   options.services.skynet."${name}" = {

machines/_base.nix

@@ -18,23 +18,8 @@ in {
     # for the secrets
     inputs.agenix.nixosModules.default
 
-    # base config for all servers
+    # base application config for all servers
     ../applications/_base.nix
-
-    # every sever may need the firewall config stuff
-    ../applications/firewall.nix
-
-    # every sever needs to have a dns record
-    ../applications/dns.nix
-
-    # every server needs teh ldap client for admins
-    ../applications/ldap/client.nix
-
-    # every server will need the config to backup to
-    ../applications/restic.nix
-
-    # every server will be monitored for grafana
-    ../applications/prometheus.nix
   ];
 
   options.skynet = {

machines/retired/ash.nix

@@ -22,9 +22,6 @@ Notes:    Thius vpn is for admin use only, to give access to all the servers via
   hostname = ip_pub;
 in {
   imports = [
-    # applications for this particular server
-    ../applications/firewall.nix
-    ../applications/dns.nix
   ];
 
   deployment = {