From 4dcbc6cd4e627f7aaae9fac4dc568ddf7175be2f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 11 Dec 2021 10:00:12 +0200 Subject: [PATCH] move all services to subfolder --- configuration.nix | 27 +++++++++---------- .../services/backup}/restic.nix | 0 .../services/cloud}/nextcloud.nix | 0 {git => generic/services/git}/gitea.nix | 0 .../services/letsencrypt}/acme.nix | 0 .../services/letsencrypt}/resolve.nix | 0 .../services/mail}/alps-package.nix | 0 .../system => generic/services/mail}/alps.nix | 0 .../services/mail}/mailserver.nix | 0 .../services/passmgr}/bitwarden.nix | 0 .../services/social}/config.exs | 0 .../services/social}/pleroma-module.nix | 0 .../services/social}/pleroma-package.nix | 0 .../services/social}/pleroma.nix | 0 .../services/videomeet}/jitsi.nix | 0 {vpn => generic/services/vpn}/ocserv.nix | 0 .../services/webserver}/memcached.nix | 0 .../services/webserver}/nginx.nix | 0 18 files changed, 13 insertions(+), 14 deletions(-) rename {backup => generic/services/backup}/restic.nix (100%) rename {nextcloud => generic/services/cloud}/nextcloud.nix (100%) rename {git => generic/services/git}/gitea.nix (100%) rename {letsencrypt => generic/services/letsencrypt}/acme.nix (100%) rename {letsencrypt => generic/services/letsencrypt}/resolve.nix (100%) rename {mailserver/system => generic/services/mail}/alps-package.nix (100%) rename {mailserver/system => generic/services/mail}/alps.nix (100%) rename {mailserver/system => generic/services/mail}/mailserver.nix (100%) rename {passmgr => generic/services/passmgr}/bitwarden.nix (100%) rename {social => generic/services/social}/config.exs (100%) rename {social => generic/services/social}/pleroma-module.nix (100%) rename {social => generic/services/social}/pleroma-package.nix (100%) rename {social => generic/services/social}/pleroma.nix (100%) rename {videomeet => generic/services/videomeet}/jitsi.nix (100%) rename {vpn => generic/services/vpn}/ocserv.nix (100%) rename {webserver => generic/services/webserver}/memcached.nix (100%) rename {webserver => generic/services/webserver}/nginx.nix (100%) diff --git a/configuration.nix b/configuration.nix index 1281ac4..afdcafb 100644 --- a/configuration.nix +++ b/configuration.nix @@ -6,27 +6,26 @@ in { imports = [ ./hardware-configuration.nix - ./variables-module.nix ./variables.nix ./files.nix ./users.nix - ./mailserver/system/mailserver.nix - ./mailserver/system/alps.nix - ./vpn/ocserv.nix ./api/api.nix ./api/api-module.nix - ./social/pleroma.nix - ./letsencrypt/acme.nix - ./letsencrypt/resolve.nix - ./backup/restic.nix - ./passmgr/bitwarden.nix - ./webserver/nginx.nix - ./webserver/memcached.nix - ./nextcloud/nextcloud.nix ./resources/limits.nix - ./videomeet/jitsi.nix - ./git/gitea.nix + ./generic/services/backup/restic.nix + ./generic/services/cloud/nextcloud.nix + ./generic/services/git/gitea.nix + ./generic/services/letsencrypt/acme.nix + ./generic/services/letsencrypt/resolve.nix + ./generic/services/mail/alps.nix + ./generic/services/mail/mailserver.nix + ./generic/services/passmgr/bitwarden.nix + ./generic/services/social/pleroma.nix + ./generic/services/videomeet/jitsi.nix + ./generic/services/vpn/ocserv.nix + ./generic/services/webserver/memcached.nix + ./generic/services/webserver/nginx.nix ]; nixpkgs.overlays = [ (nix-overlay) ]; diff --git a/backup/restic.nix b/generic/services/backup/restic.nix similarity index 100% rename from backup/restic.nix rename to generic/services/backup/restic.nix diff --git a/nextcloud/nextcloud.nix b/generic/services/cloud/nextcloud.nix similarity index 100% rename from nextcloud/nextcloud.nix rename to generic/services/cloud/nextcloud.nix diff --git a/git/gitea.nix b/generic/services/git/gitea.nix similarity index 100% rename from git/gitea.nix rename to generic/services/git/gitea.nix diff --git a/letsencrypt/acme.nix b/generic/services/letsencrypt/acme.nix similarity index 100% rename from letsencrypt/acme.nix rename to generic/services/letsencrypt/acme.nix diff --git a/letsencrypt/resolve.nix b/generic/services/letsencrypt/resolve.nix similarity index 100% rename from letsencrypt/resolve.nix rename to generic/services/letsencrypt/resolve.nix diff --git a/mailserver/system/alps-package.nix b/generic/services/mail/alps-package.nix similarity index 100% rename from mailserver/system/alps-package.nix rename to generic/services/mail/alps-package.nix diff --git a/mailserver/system/alps.nix b/generic/services/mail/alps.nix similarity index 100% rename from mailserver/system/alps.nix rename to generic/services/mail/alps.nix diff --git a/mailserver/system/mailserver.nix b/generic/services/mail/mailserver.nix similarity index 100% rename from mailserver/system/mailserver.nix rename to generic/services/mail/mailserver.nix diff --git a/passmgr/bitwarden.nix b/generic/services/passmgr/bitwarden.nix similarity index 100% rename from passmgr/bitwarden.nix rename to generic/services/passmgr/bitwarden.nix diff --git a/social/config.exs b/generic/services/social/config.exs similarity index 100% rename from social/config.exs rename to generic/services/social/config.exs diff --git a/social/pleroma-module.nix b/generic/services/social/pleroma-module.nix similarity index 100% rename from social/pleroma-module.nix rename to generic/services/social/pleroma-module.nix diff --git a/social/pleroma-package.nix b/generic/services/social/pleroma-package.nix similarity index 100% rename from social/pleroma-package.nix rename to generic/services/social/pleroma-package.nix diff --git a/social/pleroma.nix b/generic/services/social/pleroma.nix similarity index 100% rename from social/pleroma.nix rename to generic/services/social/pleroma.nix diff --git a/videomeet/jitsi.nix b/generic/services/videomeet/jitsi.nix similarity index 100% rename from videomeet/jitsi.nix rename to generic/services/videomeet/jitsi.nix diff --git a/vpn/ocserv.nix b/generic/services/vpn/ocserv.nix similarity index 100% rename from vpn/ocserv.nix rename to generic/services/vpn/ocserv.nix diff --git a/webserver/memcached.nix b/generic/services/webserver/memcached.nix similarity index 100% rename from webserver/memcached.nix rename to generic/services/webserver/memcached.nix diff --git a/webserver/nginx.nix b/generic/services/webserver/nginx.nix similarity index 100% rename from webserver/nginx.nix rename to generic/services/webserver/nginx.nix