Move irc services to modules

diff --git a/modules/private/default.nix b/modules/private/default.nix
index a7a23c220475cc66821c542a19cbe3465b27b724..20303150b2e8fae017234e5afcd2c37b313c7bb2 100644 (file)
--- a/modules/private/default.nix
+++ b/modules/private/default.nix
@@ -9,4 +9,6 @@
   openldap   = ./databases/openldap;
   postgresql = ./databases/postgresql.nix;
   redis      = ./databases/redis.nix;
+
+  irc = ./irc.nix;
 }

diff --git a/nixops/modules/irc.nix b/modules/private/irc.nix
similarity index 55%
rename from nixops/modules/irc.nix
rename to modules/private/irc.nix
index 363bfef6b3b6f3801e78e5f6f6548f2d57d247a8..b3fe91f40bd66d854e0f4e3deda73c5a70f90cf6 100644 (file)
--- a/nixops/modules/irc.nix
+++ b/modules/private/irc.nix
@@ -1,7 +1,13 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config, ... }:
+let
+  cfg = config.myServices.irc;
+in
 {
-  options = {
-    services.irc.enable = lib.mkOption {
+  options.myServices = {
+    ircCerts = lib.mkOption {
+      description = "Default ircconfigurations for certificates as accepted by acme";
+    };
+    irc.enable = lib.mkOption {
       type = lib.types.bool;
       default = false;
       description = ''
@@ -10,8 +16,8 @@
     };
   };
 
-  config = lib.mkIf config.services.irc.enable {
-    security.acme.certs."irc" = config.services.myCertificates.certConfig // {
+  config = lib.mkIf cfg.enable {
+    security.acme.certs."irc" = config.myServices.ircCerts // {
       domain = "irc.immae.eu";
       postRun = ''
         systemctl restart stunnel.service
@@ -19,18 +25,18 @@
     };
 
     networking.firewall.allowedTCPPorts = [ 6697 ];
-    services.bitlbee = {
+    services.bitlbee = with pkgs; {
       enable = true;
       authMode = "Registered";
       libpurple_plugins = [
-        pkgs.purple-hangouts
-        pkgs.purple-matrix
+        purple-hangouts
+        purple-matrix
       ];
       plugins = [
-        pkgs.bitlbee-mastodon
-        pkgs.bitlbee-facebook
-        pkgs.bitlbee-discord
-        pkgs.bitlbee-steam
+        bitlbee-mastodon
+        bitlbee-facebook
+        bitlbee-discord
+        bitlbee-steam
       ];
     };
 

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 37f901e5e39855b63d3da7167c04e3914b03604d..a0c5c7c1a5a51347e4567d600dcf2e081ef157ec 100644 (file)
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -41,14 +41,13 @@
       ./modules/ftp.nix
       ./modules/pub
       ./modules/task
-      ./modules/irc.nix
       ./modules/buildbot
       ./modules/dns.nix
     ] ++ (builtins.attrValues (import ../modules));
     myServices.databases.enable = true;
+    myServices.irc.enable = true;
     services.myGitolite.enable = true;
     services.pure-ftpd.enable = true;
-    services.irc.enable = true;
     services.pub.enable = true;
     services.myTasks.enable = true;
     services.buildbot.enable = true;

diff --git a/nixops/modules/certificates.nix b/nixops/modules/certificates.nix
index 72896fdab6b0ccb7fb2be272e82740d13897a78a..43f6a2343afafeba86880779f6aa66afc75c6447 100644 (file)
--- a/nixops/modules/certificates.nix
+++ b/nixops/modules/certificates.nix
@@ -17,6 +17,7 @@
   config = {
     services.websitesCerts = config.services.myCertificates.certConfig;
     myServices.databasesCerts = config.services.myCertificates.certConfig;
+    myServices.ircCerts = config.services.myCertificates.certConfig;
 
     security.acme.preliminarySelfsigned = true;