From 005688c2126cd1e2367b7814360a5626a77d0cfa Mon Sep 17 00:00:00 2001 From: loooph Date: Tue, 31 Aug 2021 20:44:48 +0200 Subject: [PATCH] removed unused files --- configuration.nix | 5 --- dns.nix | 7 --- jitsi.nix | 18 -------- ldap-posix.nix | 15 ------- mail.nix | 57 ------------------------ modules/services/mediagoblin/default.nix | 17 ------- murmur.nix | 7 --- nextcloud.nix | 51 --------------------- pkgs/servers/mediagoblin/default.nix | 40 ----------------- syncthing.nix | 7 --- 10 files changed, 224 deletions(-) delete mode 100644 dns.nix delete mode 100644 jitsi.nix delete mode 100644 ldap-posix.nix delete mode 100644 mail.nix delete mode 100644 modules/services/mediagoblin/default.nix delete mode 100644 murmur.nix delete mode 100644 nextcloud.nix delete mode 100644 pkgs/servers/mediagoblin/default.nix delete mode 100644 syncthing.nix diff --git a/configuration.nix b/configuration.nix index 54f36de..b9eda9b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -8,18 +8,13 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - #./nextcloud.nix ./matrix-synapse.nix ./nginx.nix ./openldap.nix - #./syncthing.nix ./fail2ban.nix ./git.nix - #./jitsi.nix ./postgres.nix ./sd.nix - #./mail.nix - #./ldap-posix.nix ]; # Boot diff --git a/dns.nix b/dns.nix deleted file mode 100644 index 92e35af..0000000 --- a/dns.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, pkgs, ... }: - -{ - services.unbound = { - # TODO - } -} diff --git a/jitsi.nix b/jitsi.nix deleted file mode 100644 index 067ba09..0000000 --- a/jitsi.nix +++ /dev/null @@ -1,18 +0,0 @@ -{config, pkgs, ...}: - -let fqdn = "treffen.bib3.de"; in -{ - services.jitsi-meet = { - enable = true; - hostName = "${fqdn}"; - interfaceConfig = { - SHOW_JITSI_WATERMARK = false; - SHOW_WATERMARK_FOR_GUESTS = false; - }; - }; - - services.nginx.virtualHosts.${fqdn} = { - enableACME = true; - forceSSL = true; - }; -} diff --git a/ldap-posix.nix b/ldap-posix.nix deleted file mode 100644 index cfbd853..0000000 --- a/ldap-posix.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, pkgs, ... }: - -{ - users.ldap = { - base = "ou=users,o=bib3,c=DE"; - useTLS = true; - daemon.enable = true; - enable = true; - server = "ldap://127.0.0.1"; - loginPam = true; - timeLimit = 10; - }; - security.pam.services.sshd.makeHomeDir = true; - -} diff --git a/mail.nix b/mail.nix deleted file mode 100644 index 1c7f447..0000000 --- a/mail.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ config, pkgs, ... }: -{ - imports = [ - (builtins.fetchTarball { - url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-20.03/nixos-mailserver-nixos-20.09.tar.gz"; - sha256 = "02k25bh4pg31cx40ri4ynjw65ahy0mmj794hi5i1yn48j56vdbkj"; - }) - ]; - mailserver = { - enable = true; - fqdn = "bib3.de"; - domains = [ "bib3.de" ]; - certificateScheme = 3; - enableImap = true; - enablePop3 = true; - enableImapSsl = true; - enablePop3Ssl = true; - - #enableManageSieve = true; - - loginAccounts = { - "webmaster@bib3.de" = { - hashedPassword = "$6$/gNzrl3XvdKYD.aF$0Amy4k4PgrhIuvzEP9yfbIvGhmNP/kQ1a.NlTHjd.01qt38/f02zFUkcI/Rb/tltW17rn8Q73.ckDJ.EvIoLb0"; - }; - }; - }; - - services.dovecot2.extraConfig = '' - auth_debug = yes - userdb { - args = /etc/dovecot/dovecot-ldap.conf.ext - driver = ldap - } - passdb { - args = /etc/dovecot/dovecot-ldap.conf.ext - driver = ldap - } - ''; - - environment.etc."dovecot/dovecot-ldap.conf.ext" = { - mode = "0600"; - text = '' - hosts = 127.0.0.1 - ldap_version = 3 - tls = yes - base = ou=users,o=bib3,c=DE - user_attrs = =home=/home/bib3/%{ldap:cn},cn=uid,o=gid - user_filter = (&(objectClass=InetOrgPerson)(cn=%n)) - pass_attrs = cn=user,userPassword=password - pass_filter = (&(objectClass=InetOrgPerson)(cn=%n)) - default_pass_scheme = SHA512 - ''; - uid = config.ids.uids.dovecot2; - gid = config.ids.gids.dovecot2; - }; -} - diff --git a/modules/services/mediagoblin/default.nix b/modules/services/mediagoblin/default.nix deleted file mode 100644 index 1b8c1f6..0000000 --- a/modules/services/mediagoblin/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{lib, pkgs, config,...}: - -with lib; -let - cfg = config.services.mediagoblin; -in { - options.services.mediagoblin = { - enable = mkEnableOption "mediagoblin service"; - }; - - config = mkIf cfg.enable { - systemd.services.mediagoblin = { - wantedBy = [ "networking.target" ]; - serviceConfig.ExecStart = "${pkgs.mediagoblin}/bin/mediagoblin"; - }; - }; -} diff --git a/murmur.nix b/murmur.nix deleted file mode 100644 index f1c1afa..0000000 --- a/murmur.nix +++ /dev/null @@ -1,7 +0,0 @@ -let host = "bib3.de"; in -{ - services.murmur = { - enable = true; - hostname = "$host"; - }; -} diff --git a/nextcloud.nix b/nextcloud.nix deleted file mode 100644 index 0fca7da..0000000 --- a/nextcloud.nix +++ /dev/null @@ -1,51 +0,0 @@ -{config, pkgs, ...}: -let - fqdn = "nextcloud.bib3.de"; -in { - services.nginx = { - enable = true; - - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - - sslCiphers = "AES256+EECDH:AES256+EDH:!aNULL"; - - virtualHosts.${fqdn} = { - forceSSL = true; - enableACME = true; - }; - }; - - services.nextcloud = { - enable = true; - hostName = fqdn; - nginx.enable = true; - config = { - dbtype = "pgsql"; - dbuser = "nextcloud"; - dbhost = "/run/postgresql"; - dbname = "nextcloud"; - adminpassFile = "/var/lib/nextcloud/config/adminpass"; - adminuser = "root"; - }; - }; - - systemd.services."nextcloud-setup" = { - requires = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - }; - - services.postgresql = { - enable = true; - ensureDatabases = [ "nextcloud" ]; - ensureUsers = [ - { - name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - } - ]; - }; - -} diff --git a/pkgs/servers/mediagoblin/default.nix b/pkgs/servers/mediagoblin/default.nix deleted file mode 100644 index 947e0a9..0000000 --- a/pkgs/servers/mediagoblin/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -#{ lib, stdenv, fetchurl, ... }: - -with import {}; - -stdenv.mkDerivation rec { - pname = "mediagoblin"; - version = "0.11.0"; - - src = fetchurl { - url = "https://git.savannah.gnu.org/cgit/${pname}.git/snapshot/${pname}-${version}.tar.gz"; - sha256 = "1izvnd6x8bmvw36cjpfgmgh7f2gnbf7mni3s29svdjp0ww4szzxn"; - }; - - doCheck = true; - - nativeBuildInputs = [ - autoconf - m4 - nodejs - python3 - python3Packages.certifi - python3Packages.lxml - python3Packages.pillow - python3Packages.virtualenv - ]; - - buildInputs = [ - sqlite - - ]; - - meta = with lib; { - description = "media publishing platform that anyone can run"; - longDescription = '' - MediaGoblin is a free software media publishing platform that anyone can run. You can think of it as a decentralized alternative to Flickr, YouTube, SoundCloud, etc. - ''; - homepage = "https://mediagoblin.org/"; - license = licenses.gpl3Plus; - }; -} diff --git a/syncthing.nix b/syncthing.nix deleted file mode 100644 index 891196e..0000000 --- a/syncthing.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, pkgs, ...}: - -{ - services.syncthing = { - enable = true; - }; -}