4 files changed, 2 insertions, 130 deletions
diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix
index 0dcad971..f891498c 100644
--- a/lass/3modules/default.nix
+++ b/lass/3modules/default.nix
@@ -3,7 +3,6 @@ _:
   imports = [
     ./xresources.nix
     ./folderPerms.nix
-    ./newsbot-js.nix
     ./per-user.nix
     ./urxvtd.nix
     ./xresources.nix
diff --git a/lass/3modules/newsbot-js.nix b/lass/3modules/newsbot-js.nix
deleted file mode 100644
index 5e340b26..00000000
--- a/lass/3modules/newsbot-js.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with builtins;
-with lib;
-
-let
-  cfg = config.lass.newsbot-js;
-
-  out = {
-    options.lass.newsbot-js = api;
-    config = mkIf cfg.enable imp;
-  };
-
-  api = {
-    enable = mkEnableOption "Enable krebs newsbot";
-    ircServer = mkOption {
-      type = types.str;
-      default = "echelon.retiolum";
-      description = "to which server the bot should connect";
-    };
-    channel = mkOption {
-      type = types.str;
-      default = "#news";
-      description = "post the news in this channel";
-    };
-    masterNick = mkOption {
-      type = types.str;
-      default = "knews";
-      description = "nickname of the master bot";
-    };
-    feeds = mkOption {
-      type = types.path;
-      description = ''
-        file with feeds to post
-        format:
-        $nick|$feedURI
-      '';
-    };
-    urlShortenerHost = mkOption {
-      type = types.str;
-      default = "echelon";
-      description = "what server to use for url shortening, host";
-    };
-    urlShortenerPort = mkOption {
-      type = types.str;
-      default = "80";
-      description = "what server to use for url shortening, port";
-    };
-  };
-
-  imp = {
-    users.extraUsers.newsbot-js = {
-      name = "newsbot-js";
-      uid = genid "newsbot-js";
-      description = "newsbot-js user";
-      home = "/var/empty";
-    };
-
-    systemd.services.newsbot-js = {
-      description = "krebs newsbot";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-
-      path = with pkgs; [
-        newsbot-js
-      ];
-
-      environment = {
-        irc_server = cfg.ircServer;
-        master_nick = cfg.masterNick;
-        news_channel = cfg.channel;
-        feeds_file = cfg.feeds;
-        url_shortener_host = cfg.urlShortenerHost;
-        url_shortener_port = cfg.urlShortenerPort;
-      };
-
-      restartIfChanged = true;
-
-      serviceConfig = {
-        User = "newsbot-js";
-        Restart = "always";
-        ExecStart = "${pkgs.newsbot-js}/bin/newsbot";
-      };
-    };
-  };
-
-in out
diff --git a/lass/3modules/owncloud_nginx.nix b/lass/3modules/owncloud_nginx.nix
index a10df779..35d8d04a 100644
--- a/lass/3modules/owncloud_nginx.nix
+++ b/lass/3modules/owncloud_nginx.nix
@@ -45,24 +45,6 @@ let
         instanceid = mkOption {
           type = str;
         };
-        ssl = mkOption {
-          type = with types; submodule ({
-            options = {
-              enable = mkEnableOption "ssl";
-              certificate = mkOption {
-                type = str;
-              };
-              certificate_key = mkOption {
-                type = str;
-              };
-              ciphers = mkOption {
-                type = str;
-                default = "AES128+EECDH:AES128+EDH";
-              };
-            };
-          });
-          default = {};
-        };
       };
     }));
     default = {};
@@ -72,7 +54,7 @@ let
   group = config.services.nginx.group;
 
   imp = {
-    krebs.nginx.servers = flip mapAttrs cfg ( name: { domain, folder, ssl, ... }: {
+    krebs.nginx.servers = flip mapAttrs cfg ( name: { domain, folder, ... }: {
       server-names = [
         "${domain}"
         "www.${domain}"
@@ -116,16 +98,7 @@ let
 
         error_page 403 /core/templates/403.php;
         error_page 404 /core/templates/404.php;
-        ${if ssl.enable then ''
-          ssl_certificate ${ssl.certificate};
-          ssl_certificate_key ${ssl.certificate_key};
-        '' else ""}
       '';
-      listen = (if ssl.enable then
-          [ "80" "443 ssl" ]
-        else
-          "80"
-      );
     });
     services.phpfpm.poolConfigs = flip mapAttrs cfg (name: { domain, folder, ... }: ''
       listen = ${folder}/phpfpm.pool
diff --git a/lass/3modules/static_nginx.nix b/lass/3modules/static_nginx.nix
index 93441cf0..6e87e985 100644
--- a/lass/3modules/static_nginx.nix
+++ b/lass/3modules/static_nginx.nix
@@ -42,10 +42,6 @@ let
               certificate_key = mkOption {
                 type = str;
               };
-              ciphers = mkOption {
-                type = str;
-                default = "AES128+EECDH:AES128+EDH";
-              };
             };
           });
           default = {};
@@ -74,16 +70,7 @@ let
           deny all;
         '')
       ];
-
-      listen = (if ssl.enable then
-          [ "80" "443 ssl" ]
-        else
-          "80"
-      );
-      extraConfig = (if ssl.enable then ''
-        ssl_certificate ${ssl.certificate};
-        ssl_certificate_key ${ssl.certificate_key};
-      '' else "");
+      inherit ssl;
 
     });
   };