Moved everything into ./modules

84 files changed, 13 insertions, 14 deletions

diff --git a/default.nix b/default.nix
index 0b7516d..c245624 100644
--- a/default.nix
+++ b/default.nix
@@ -1,16 +1,4 @@
-{ lib, ... }:
-
-let
-  all = lib.filterAttrs
-    ( n: _: n != "default.nix"
-           && ! lib.hasPrefix "." n
-           && ! lib.hasPrefix "LICENSE" n
-           && ! lib.hasPrefix "README" n
-           && ! lib.hasPrefix "ChangeLog" n
-           && ! lib.hasPrefix "TODO" n
-    ) (builtins.readDir ./.);
-
-in {
-  imports = map (p: ./. + "/${p}") ( builtins.attrNames all );
+{
+  imports = [ ./modules ];
 }
 
diff --git a/apps/cli.nix b/modules/apps/cli.nix
index 00365d8..00365d8 100644
--- a/apps/cli.nix
+++ b/modules/apps/cli.nix
diff --git a/apps/default.nix b/modules/apps/default.nix
index 240d970..240d970 100644
--- a/apps/default.nix
+++ b/modules/apps/default.nix
diff --git a/apps/filebackup.nix b/modules/apps/filebackup.nix
index 4aee0a9..4aee0a9 100644
--- a/apps/filebackup.nix
+++ b/modules/apps/filebackup.nix
diff --git a/apps/icinga2.nix b/modules/apps/icinga2.nix
index 6df18fc..6df18fc 100644
--- a/apps/icinga2.nix
+++ b/modules/apps/icinga2.nix
diff --git a/apps/icingaweb2.nix b/modules/apps/icingaweb2.nix
index ed52f86..ed52f86 100644
--- a/apps/icingaweb2.nix
+++ b/modules/apps/icingaweb2.nix
diff --git a/apps/juandelacosa.nix b/modules/apps/juandelacosa.nix
index 8df6af0..8df6af0 100644
--- a/apps/juandelacosa.nix
+++ b/modules/apps/juandelacosa.nix
diff --git a/apps/mariadb/default.nix b/modules/apps/mariadb/default.nix
index cdf5d92..cdf5d92 100644
--- a/apps/mariadb/default.nix
+++ b/modules/apps/mariadb/default.nix
diff --git a/apps/mariadb/mysqld.nix b/modules/apps/mariadb/mysqld.nix
index d66d96d..d66d96d 100644
--- a/apps/mariadb/mysqld.nix
+++ b/modules/apps/mariadb/mysqld.nix
diff --git a/apps/mariadb/procedures.sql b/modules/apps/mariadb/procedures.sql
index 3aabe80..3aabe80 100644
--- a/apps/mariadb/procedures.sql
+++ b/modules/apps/mariadb/procedures.sql
diff --git a/apps/mariadb/replicate.nix b/modules/apps/mariadb/replicate.nix
index 9f51dbf..9f51dbf 100644
--- a/apps/mariadb/replicate.nix
+++ b/modules/apps/mariadb/replicate.nix
diff --git a/apps/mariadb/roles.nix b/modules/apps/mariadb/roles.nix
index 2971242..2971242 100644
--- a/apps/mariadb/roles.nix
+++ b/modules/apps/mariadb/roles.nix
diff --git a/apps/mariadb/slave-watchdog.nix b/modules/apps/mariadb/slave-watchdog.nix
index 8d1147e..8d1147e 100644
--- a/apps/mariadb/slave-watchdog.nix
+++ b/modules/apps/mariadb/slave-watchdog.nix
diff --git a/apps/mediawiki/default.nix b/modules/apps/mediawiki/default.nix
index 584d86a..584d86a 100644
--- a/apps/mediawiki/default.nix
+++ b/modules/apps/mediawiki/default.nix
diff --git a/apps/mediawiki/localSettings.nix b/modules/apps/mediawiki/localSettings.nix
index cbacd07..cbacd07 100644
--- a/apps/mediawiki/localSettings.nix
+++ b/modules/apps/mediawiki/localSettings.nix
diff --git a/apps/mysqlbackup.nix b/modules/apps/mysqlbackup.nix
index 509e010..509e010 100644
--- a/apps/mysqlbackup.nix
+++ b/modules/apps/mysqlbackup.nix
diff --git a/apps/mywatch.nix b/modules/apps/mywatch.nix
index 732033c..732033c 100644
--- a/apps/mywatch.nix
+++ b/modules/apps/mywatch.nix
diff --git a/apps/nginx.nix b/modules/apps/nginx.nix
index 3765d67..3765d67 100644
--- a/apps/nginx.nix
+++ b/modules/apps/nginx.nix
diff --git a/apps/pgbackup.nix b/modules/apps/pgbackup.nix
index 3428843..3428843 100644
--- a/apps/pgbackup.nix
+++ b/modules/apps/pgbackup.nix
diff --git a/apps/php-fpm.nix b/modules/apps/php-fpm.nix
index e69be73..e69be73 100644
--- a/apps/php-fpm.nix
+++ b/modules/apps/php-fpm.nix
diff --git a/apps/postgresql/default.nix b/modules/apps/postgresql/default.nix
index 847fc75..847fc75 100644
--- a/apps/postgresql/default.nix
+++ b/modules/apps/postgresql/default.nix
diff --git a/apps/postgresql/functions.pgsql b/modules/apps/postgresql/functions.pgsql
index 085cc5d..085cc5d 100644
--- a/apps/postgresql/functions.pgsql
+++ b/modules/apps/postgresql/functions.pgsql
diff --git a/apps/postgresql/server.nix b/modules/apps/postgresql/server.nix
index 864af5c..864af5c 100644
--- a/apps/postgresql/server.nix
+++ b/modules/apps/postgresql/server.nix
diff --git a/apps/sproxy-web.nix b/modules/apps/sproxy-web.nix
index 351e82d..351e82d 100644
--- a/apps/sproxy-web.nix
+++ b/modules/apps/sproxy-web.nix
diff --git a/apps/sproxy.nix b/modules/apps/sproxy.nix
index 2c50554..2c50554 100644
--- a/apps/sproxy.nix
+++ b/modules/apps/sproxy.nix
diff --git a/apps/strongswan/default.nix b/modules/apps/strongswan/default.nix
index d9a5034..d9a5034 100644
--- a/apps/strongswan/default.nix
+++ b/modules/apps/strongswan/default.nix
diff --git a/apps/strongswan/options/ca.nix b/modules/apps/strongswan/options/ca.nix
index e52b088..e52b088 100644
--- a/apps/strongswan/options/ca.nix
+++ b/modules/apps/strongswan/options/ca.nix
diff --git a/apps/strongswan/options/conn.nix b/modules/apps/strongswan/options/conn.nix
index ac1d88c..ac1d88c 100644
--- a/apps/strongswan/options/conn.nix
+++ b/modules/apps/strongswan/options/conn.nix
diff --git a/apps/strongswan/options/lib.nix b/modules/apps/strongswan/options/lib.nix
index 5b0808f..5b0808f 100644
--- a/apps/strongswan/options/lib.nix
+++ b/modules/apps/strongswan/options/lib.nix
diff --git a/apps/strongswan/options/setup.nix b/modules/apps/strongswan/options/setup.nix
index d60a2af..d60a2af 100644
--- a/apps/strongswan/options/setup.nix
+++ b/modules/apps/strongswan/options/setup.nix
diff --git a/deployment/default.nix b/modules/default.nix
index 240d970..240d970 100644
--- a/deployment/default.nix
+++ b/modules/default.nix
diff --git a/system/default.nix b/modules/deployment/default.nix
index 240d970..240d970 100644
--- a/system/default.nix
+++ b/modules/deployment/default.nix
diff --git a/deployment/keyrings.nix b/modules/deployment/keyrings.nix
index 6230107..6230107 100644
--- a/deployment/keyrings.nix
+++ b/modules/deployment/keyrings.nix
diff --git a/pkgs/check_aws_ec2_elb/check_aws_ec2_elb b/modules/pkgs/check_aws_ec2_elb/check_aws_ec2_elb
index 7b53cc9..7b53cc9 100755
--- a/pkgs/check_aws_ec2_elb/check_aws_ec2_elb
+++ b/modules/pkgs/check_aws_ec2_elb/check_aws_ec2_elb
diff --git a/pkgs/check_aws_ec2_elb/check_aws_ec2_elb.conf b/modules/pkgs/check_aws_ec2_elb/check_aws_ec2_elb.conf
index 9718e3c..9718e3c 100644
--- a/pkgs/check_aws_ec2_elb/check_aws_ec2_elb.conf
+++ b/modules/pkgs/check_aws_ec2_elb/check_aws_ec2_elb.conf
diff --git a/pkgs/check_aws_ec2_elb/default.nix b/modules/pkgs/check_aws_ec2_elb/default.nix
index 5162c9d..5162c9d 100644
--- a/pkgs/check_aws_ec2_elb/default.nix
+++ b/modules/pkgs/check_aws_ec2_elb/default.nix
diff --git a/pkgs/check_aws_rds/check_aws_rds b/modules/pkgs/check_aws_rds/check_aws_rds
index d4fd965..d4fd965 100644
--- a/pkgs/check_aws_rds/check_aws_rds
+++ b/modules/pkgs/check_aws_rds/check_aws_rds
diff --git a/pkgs/check_aws_rds/check_aws_rds.conf b/modules/pkgs/check_aws_rds/check_aws_rds.conf
index 2f6a84e..2f6a84e 100644
--- a/pkgs/check_aws_rds/check_aws_rds.conf
+++ b/modules/pkgs/check_aws_rds/check_aws_rds.conf
diff --git a/pkgs/check_aws_rds/default.nix b/modules/pkgs/check_aws_rds/default.nix
index 5e91b33..5e91b33 100644
--- a/pkgs/check_aws_rds/default.nix
+++ b/modules/pkgs/check_aws_rds/default.nix
diff --git a/pkgs/check_mdstat/check_mdstat b/modules/pkgs/check_mdstat/check_mdstat
index 32fc168..32fc168 100755
--- a/pkgs/check_mdstat/check_mdstat
+++ b/modules/pkgs/check_mdstat/check_mdstat
diff --git a/pkgs/check_mdstat/default.nix b/modules/pkgs/check_mdstat/default.nix
index 5e645fd..5e645fd 100644
--- a/pkgs/check_mdstat/default.nix
+++ b/modules/pkgs/check_mdstat/default.nix
diff --git a/pkgs/check_solr/cabal2nix.nix b/modules/pkgs/check_solr/cabal2nix.nix
index ee3c6b5..ee3c6b5 100644
--- a/pkgs/check_solr/cabal2nix.nix
+++ b/modules/pkgs/check_solr/cabal2nix.nix
diff --git a/pkgs/check_solr/default.nix b/modules/pkgs/check_solr/default.nix
index 27aecce..27aecce 100644
--- a/pkgs/check_solr/default.nix
+++ b/modules/pkgs/check_solr/default.nix
diff --git a/pkgs/check_systemd/check_systemd b/modules/pkgs/check_systemd/check_systemd
index e668331..e668331 100755
--- a/pkgs/check_systemd/check_systemd
+++ b/modules/pkgs/check_systemd/check_systemd
diff --git a/pkgs/check_systemd/default.nix b/modules/pkgs/check_systemd/default.nix
index da92a64..da92a64 100644
--- a/pkgs/check_systemd/default.nix
+++ b/modules/pkgs/check_systemd/default.nix
diff --git a/pkgs/default.nix b/modules/pkgs/default.nix
index d66f7ba..d66f7ba 100644
--- a/pkgs/default.nix
+++ b/modules/pkgs/default.nix
diff --git a/pkgs/gpg.nix b/modules/pkgs/gpg.nix
index a0acd20..a0acd20 100644
--- a/pkgs/gpg.nix
+++ b/modules/pkgs/gpg.nix
diff --git a/pkgs/icinga2/check_mysql_slave.patch b/modules/pkgs/icinga2/check_mysql_slave.patch
index 0658a8a..0658a8a 100644
--- a/pkgs/icinga2/check_mysql_slave.patch
+++ b/modules/pkgs/icinga2/check_mysql_slave.patch
diff --git a/pkgs/icinga2/default.nix b/modules/pkgs/icinga2/default.nix
index 5429a51..5429a51 100644
--- a/pkgs/icinga2/default.nix
+++ b/modules/pkgs/icinga2/default.nix
diff --git a/pkgs/icingaweb2/default.nix b/modules/pkgs/icingaweb2/default.nix
index 263ae47..263ae47 100644
--- a/pkgs/icingaweb2/default.nix
+++ b/modules/pkgs/icingaweb2/default.nix
diff --git a/pkgs/icingaweb2/sproxy.patch b/modules/pkgs/icingaweb2/sproxy.patch
index d1b074d..d1b074d 100644
--- a/pkgs/icingaweb2/sproxy.patch
+++ b/modules/pkgs/icingaweb2/sproxy.patch
diff --git a/pkgs/juandelacosa/cabal2nix.nix b/modules/pkgs/juandelacosa/cabal2nix.nix
index ddb6af7..ddb6af7 100644
--- a/pkgs/juandelacosa/cabal2nix.nix
+++ b/modules/pkgs/juandelacosa/cabal2nix.nix
diff --git a/pkgs/juandelacosa/default.nix b/modules/pkgs/juandelacosa/default.nix
index b37e598..b37e598 100644
--- a/pkgs/juandelacosa/default.nix
+++ b/modules/pkgs/juandelacosa/default.nix
diff --git a/pkgs/mariadb/MDEV-10463.patch b/modules/pkgs/mariadb/MDEV-10463.patch
index c094257..c094257 100644
--- a/pkgs/mariadb/MDEV-10463.patch
+++ b/modules/pkgs/mariadb/MDEV-10463.patch
diff --git a/pkgs/mariadb/default.nix b/modules/pkgs/mariadb/default.nix
index e26646d..e26646d 100644
--- a/pkgs/mariadb/default.nix
+++ b/modules/pkgs/mariadb/default.nix
diff --git a/pkgs/mathJax.nix b/modules/pkgs/mathJax.nix
index 04b596f..04b596f 100644
--- a/pkgs/mathJax.nix
+++ b/modules/pkgs/mathJax.nix
diff --git a/pkgs/mediawiki/T122487.patch b/modules/pkgs/mediawiki/T122487.patch
index 7b868a8..7b868a8 100644
--- a/pkgs/mediawiki/T122487.patch
+++ b/modules/pkgs/mediawiki/T122487.patch
diff --git a/pkgs/mediawiki/default.nix b/modules/pkgs/mediawiki/default.nix
index ef606f0..ef606f0 100644
--- a/pkgs/mediawiki/default.nix
+++ b/modules/pkgs/mediawiki/default.nix
diff --git a/pkgs/mediawiki/file-backend-default-mode.patch b/modules/pkgs/mediawiki/file-backend-default-mode.patch
index 2bd303c..2bd303c 100644
--- a/pkgs/mediawiki/file-backend-default-mode.patch
+++ b/modules/pkgs/mediawiki/file-backend-default-mode.patch
diff --git a/pkgs/mediawikiExtensions/Sproxy/Sproxy.php b/modules/pkgs/mediawikiExtensions/Sproxy/Sproxy.php
index 697c596..697c596 100644
--- a/pkgs/mediawikiExtensions/Sproxy/Sproxy.php
+++ b/modules/pkgs/mediawikiExtensions/Sproxy/Sproxy.php
diff --git a/pkgs/mediawikiExtensions/default.nix b/modules/pkgs/mediawikiExtensions/default.nix
index f2ae6f1..f2ae6f1 100644
--- a/pkgs/mediawikiExtensions/default.nix
+++ b/modules/pkgs/mediawikiExtensions/default.nix
diff --git a/pkgs/monitoringPlugins/default.nix b/modules/pkgs/monitoringPlugins/default.nix
index d0f554e..d0f554e 100644
--- a/pkgs/monitoringPlugins/default.nix
+++ b/modules/pkgs/monitoringPlugins/default.nix
diff --git a/pkgs/monitoringPlugins/mysql_check_slave.patch b/modules/pkgs/monitoringPlugins/mysql_check_slave.patch
index 09098f6..09098f6 100644
--- a/pkgs/monitoringPlugins/mysql_check_slave.patch
+++ b/modules/pkgs/monitoringPlugins/mysql_check_slave.patch
diff --git a/pkgs/mydumper.nix b/modules/pkgs/mydumper.nix
index 463cb22..463cb22 100644
--- a/pkgs/mydumper.nix
+++ b/modules/pkgs/mydumper.nix
diff --git a/pkgs/mywatch/cabal2nix.nix b/modules/pkgs/mywatch/cabal2nix.nix
index 3dfbbcc..3dfbbcc 100644
--- a/pkgs/mywatch/cabal2nix.nix
+++ b/modules/pkgs/mywatch/cabal2nix.nix
diff --git a/pkgs/mywatch/default.nix b/modules/pkgs/mywatch/default.nix
index 4afc645..4afc645 100644
--- a/pkgs/mywatch/default.nix
+++ b/modules/pkgs/mywatch/default.nix
diff --git a/pkgs/nagios-plugins-rabbitmq/default.nix b/modules/pkgs/nagios-plugins-rabbitmq/default.nix
index 6ecb2e4..6ecb2e4 100644
--- a/pkgs/nagios-plugins-rabbitmq/default.nix
+++ b/modules/pkgs/nagios-plugins-rabbitmq/default.nix
diff --git a/pkgs/probes.nix b/modules/pkgs/probes.nix
index 650c996..650c996 100644
--- a/pkgs/probes.nix
+++ b/modules/pkgs/probes.nix
diff --git a/pkgs/rdsdump/default.nix b/modules/pkgs/rdsdump/default.nix
index 0efe033..0efe033 100644
--- a/pkgs/rdsdump/default.nix
+++ b/modules/pkgs/rdsdump/default.nix
diff --git a/pkgs/rdsdump/rdsdump.bash b/modules/pkgs/rdsdump/rdsdump.bash
index 6b8cbf1..6b8cbf1 100644
--- a/pkgs/rdsdump/rdsdump.bash
+++ b/modules/pkgs/rdsdump/rdsdump.bash
diff --git a/pkgs/sproxy-web/cabal2nix.nix b/modules/pkgs/sproxy-web/cabal2nix.nix
index 0f475f2..0f475f2 100644
--- a/pkgs/sproxy-web/cabal2nix.nix
+++ b/modules/pkgs/sproxy-web/cabal2nix.nix
diff --git a/pkgs/sproxy-web/default.nix b/modules/pkgs/sproxy-web/default.nix
index 4afc645..4afc645 100644
--- a/pkgs/sproxy-web/default.nix
+++ b/modules/pkgs/sproxy-web/default.nix
diff --git a/pkgs/sproxy/cabal2nix.nix b/modules/pkgs/sproxy/cabal2nix.nix
index 1a7b3f6..1a7b3f6 100644
--- a/pkgs/sproxy/cabal2nix.nix
+++ b/modules/pkgs/sproxy/cabal2nix.nix
diff --git a/pkgs/sproxy/default.nix b/modules/pkgs/sproxy/default.nix
index 4afc645..4afc645 100644
--- a/pkgs/sproxy/default.nix
+++ b/modules/pkgs/sproxy/default.nix
diff --git a/pkgs/writeBashScript.nix b/modules/pkgs/writeBashScript.nix
index 15e81c5..15e81c5 100644
--- a/pkgs/writeBashScript.nix
+++ b/modules/pkgs/writeBashScript.nix
diff --git a/pkgs/writeBashScriptBin.nix b/modules/pkgs/writeBashScriptBin.nix
index 33b9bf6..33b9bf6 100644
--- a/pkgs/writeBashScriptBin.nix
+++ b/modules/pkgs/writeBashScriptBin.nix
diff --git a/pkgs/writePHPFile.nix b/modules/pkgs/writePHPFile.nix
index e031efe..e031efe 100644
--- a/pkgs/writePHPFile.nix
+++ b/modules/pkgs/writePHPFile.nix
diff --git a/pkgs/writeXML.nix b/modules/pkgs/writeXML.nix
index 1cfc075..1cfc075 100644
--- a/pkgs/writeXML.nix
+++ b/modules/pkgs/writeXML.nix
diff --git a/modules/system/default.nix b/modules/system/default.nix
new file mode 100644
index 0000000..240d970
--- /dev/null
+++ b/modules/system/default.nix
@@ -0,0 +1,11 @@
+{lib, ... }:
+
+let
+  all = lib.filterAttrs
+    ( n: _: n != "default.nix" && ! lib.hasPrefix "." n )
+    (builtins.readDir ./.);
+
+in {
+  imports = map (p: ./. + "/${p}") ( builtins.attrNames all );
+}
+
diff --git a/system/firewall.nix b/modules/system/firewall.nix
index 289f635..289f635 100644
--- a/system/firewall.nix
+++ b/modules/system/firewall.nix
diff --git a/system/raid0.nix b/modules/system/raid0.nix
index d260e29..d260e29 100644
--- a/system/raid0.nix
+++ b/modules/system/raid0.nix
diff --git a/system/sysops.nix b/modules/system/sysops.nix
index ccf6d0b..ccf6d0b 100644
--- a/system/sysops.nix
+++ b/modules/system/sysops.nix
diff --git a/system/users.nix b/modules/system/users.nix
index 022a7e7..022a7e7 100644
--- a/system/users.nix
+++ b/modules/system/users.nix
diff --git a/system/worldWritableDirs.nix b/modules/system/worldWritableDirs.nix
index 9899696..9899696 100644
--- a/system/worldWritableDirs.nix
+++ b/modules/system/worldWritableDirs.nix