diff --git a/flake.nix b/flake.nix index 3500062a..72688f9c 100644 --- a/flake.nix +++ b/flake.nix @@ -368,13 +368,6 @@ ]; }; - direkthilfe = nixosSystem' { - modules = [ - self.nixosModules.microvm - ./hosts/direkthilfe - ]; - }; - drone = nixosSystem' { modules = [ self.nixosModules.microvm @@ -759,13 +752,6 @@ ./hosts/tmppleroma ]; }; - - zengel = nixosSystem' { - modules = [ - self.nixosModules.microvm - ./hosts/zengel - ]; - }; }; nixosModules = { diff --git a/hosts/direkthilfe/default.nix b/hosts/direkthilfe/default.nix deleted file mode 100644 index 70bd95ce..00000000 --- a/hosts/direkthilfe/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ config, pkgs, ... }: - -{ - microvm.mem = 1024; - c3d2.deployment.server = "server10"; - - environment.systemPackages = with pkgs; [ vim git ]; - - networking.hostName = "direkthilfe"; - - services = { - openssh = { - enable = true; - extraConfig = '' - Match Group sftponly - # ChrootDirectory /home/%u - ForceCommand internal-sftp - AllowTcpForwarding no - ''; - }; - - engelsystem = { - enable = true; - domain = "direkthilfe.c3d2.de"; - createDatabase = true; - package = pkgs.engelsystem.override { php = pkgs.php74; }; - config = { - database = { - host = "localhost"; - database = "engelsystem"; - username = "engelsystem"; - }; - timezone = "Europe/Berlin"; - signup_requires_arrival = true; - autoarrive = true; - signup_advance_hours = 0; - last_unsubscribe = 24; - enable_dect = false; - enable_planned_arrival = false; - enable_tshirt_size = false; - enable_goody = false; - max_freeloadable_shifts = 20; - night_shifts.enabled = false; - default_locale = "de_DE"; - footer_items.Contact = "mailto:direkthilfe@notraces.net"; - footer_items.FAQ = "https://www.c3d2.de/kontakt.html"; - email = { - driver = "smtp"; - from.address = "mail@c3d2.de"; - from.name = "Engelsystem"; - host = "mail.c3d2.de"; - port = 587; - tls = true; - #sendmail = "${pkgs.ssmtp}/bin/sendmail -bs"; - }; - }; - }; - - nginx = { - enable = true; - virtualHosts."${config.services.engelsystem.domain}" = { - default = true; - forceSSL = true; - enableACME = true; - }; - }; - - phpfpm.phpPackage = pkgs.php74; - - # ssmtp = { - # enable = true; - # root = "mail@c3d2.de"; - # useTLS = true; - # useSTARTTLS = true; - # hostName = "mail.c3d2.de:587"; - # domain = "direkthilfe.c3d2.de"; - # settings = { - # hostname = "direkthilfe.serv.zentralwerk.org"; - # }; - # }; - }; - - system.stateVersion = "21.11"; - - users = { - groups.sftponly = {}; - users.hilfe = { - isNormalUser = true; - group = "users"; - extraGroups = [ "sftponly" ]; - }; - }; -} diff --git a/hosts/public-access-proxy/default.nix b/hosts/public-access-proxy/default.nix index 9293d554..b5ff3d01 100644 --- a/hosts/public-access-proxy/default.nix +++ b/hosts/public-access-proxy/default.nix @@ -29,12 +29,6 @@ hostNames = [ "zw.poelzi.org" ]; proxyTo.host = "172.20.73.162"; matchArg = "-m end"; - } { - hostNames = [ "direkthilfe.c3d2.de" ]; - proxyTo = { - host = hostRegistry.direkthilfe.ip4; - }; - matchArg = "-m end"; } { hostNames = [ "staging.dvb.solutions" ]; proxyTo = { @@ -122,9 +116,6 @@ } { hostNames = [ "wiki.c3d2.de" ]; proxyTo.host = hostRegistry.mediawiki.ip4; - } { - hostNames = [ "zengel.datenspuren.de" ]; - proxyTo.host = hostRegistry.zengel.ip4; } { hostNames = [ "owncast.c3d2.de" ]; proxyTo.host = hostRegistry.owncast.ip4; diff --git a/hosts/zengel/default.nix b/hosts/zengel/default.nix deleted file mode 100644 index 0ebe719e..00000000 --- a/hosts/zengel/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ config, pkgs, ... }: - -{ - networking.hostName = "zengel"; - microvm.mem = 1024; - c3d2.deployment.server = "server10"; - - services.engelsystem = { - enable = true; - domain = "zengel.datenspuren.de"; - createDatabase = true; - package = pkgs.engelsystem.override { php = pkgs.php74; }; - config = { - database = { - host = "localhost"; - database = "engelsystem"; - username = "engelsystem"; - }; - timezone = "Europe/Berlin"; - signup_requires_arrival = true; - autoarrive = true; - signup_advance_hours = 0; - last_unsubscribe = 24; - enable_dect = false; - enable_planned_arrival = false; - enable_tshirt_size = false; - enable_goody = false; - max_freeloadable_shifts = 20; - night_shifts.enabled = false; - default_locale = "de_DE"; - footer_items.Contact = "mailto:mail@c3d2.de"; - footer_items.FAQ = "https://www.c3d2.de/kontakt.html"; - email = { - driver = "smtp"; - from.address = "mail@c3d2.de"; - from.name = "Engelsystem"; - host = "mail.c3d2.de"; - port = 587; - tls = true; - #sendmail = "${pkgs.ssmtp}/bin/sendmail -bs"; - }; - }; - }; - services.phpfpm.phpPackage = pkgs.php74; - services.nginx = { - enable = true; - virtualHosts."${config.services.engelsystem.domain}" = { - default = true; - forceSSL = true; - enableACME = true; - }; - }; - - # services.ssmtp = { - # enable = true; - # root = "mail@c3d2.de"; - # useTLS = true; - # useSTARTTLS = true; - # hostName = "mail.c3d2.de:587"; - # domain = "direkthilfe.c3d2.de"; - # settings = { - # hostname = "direkthilfe.serv.zentralwerk.org"; - # }; - # }; - - system.stateVersion = "22.05"; -}