diff options
| author | stuebinm | 2022-10-04 14:30:01 +0200 | 
|---|---|---|
| committer | stuebinm | 2022-10-04 14:30:31 +0200 | 
| commit | 9bc17ed5ff1d385fad2dee0020fb46cfc5f2512e (patch) | |
| tree | d9a29458e5094748662bc4c1d6d14d25de20c440 | |
| parent | 6ff91619ce6fbc9e19774a07a3065b2c329bac9b (diff) | |
remove some old stuff
Diffstat (limited to '')
| -rw-r--r-- | chaski/services/jitsi.nix | 59 | ||||
| -rw-r--r-- | flora/services/cgit.nix | 2 | ||||
| -rw-r--r-- | flora/services/hedgedoc.nix | 77 | ||||
| -rw-r--r-- | flora/services/surveys.nix | 23 | ||||
| -rw-r--r-- | home/packages-minimal.nix | 4 | 
5 files changed, 1 insertions, 164 deletions
| diff --git a/chaski/services/jitsi.nix b/chaski/services/jitsi.nix deleted file mode 100644 index d6f398b..0000000 --- a/chaski/services/jitsi.nix +++ /dev/null @@ -1,59 +0,0 @@ -{config, pkgs, ...}: - -with pkgs.luaPackages; -with pkgs; -let extraLua = import ../../../../playground/jitsi/test.nix; -in - -{ -  services.jitsi-meet = { -    enable = true; -    hostName = "jitsi.stuebinm.eu"; -    config = { -      enableWelcomePage = true; -      prejoinPageEnabled = true; -    }; -    interfaceConfig = { -      SHOW_JITSI_WATERMARK = false; -      SHOW_WATERMARK_FOR_GUESTS = false; -    }; -  }; -  services.jitsi-videobridge.openFirewall = true; - -  services.nginx.virtualHosts."api.jitsi.stuebinm.eu" = { -    locations."/room-size" = { -      proxyPass = pkgs.lib.mkForce -        "http://jitsi.stuebinm.eu:5280/room-size?$args&domain=jitsi.stuebinm.eu"; - -      extraConfig = '' -        add_header Access-Control-Allow-Origin *; -      ''; -    }; -    locations."/room-list" = { -      proxyPass = "http://jitsi.stuebinm.eu:5280/room-list?domain=jitsi.stuebinm.eu"; -      extraConfig = '' -        add_header Access-Control-Allow-Origin *; -      ''; -    }; -    locations."/dashboard/".root = -      pkgs.copyPathToStore ../../../../playground/jitsi/html; - -    enableACME = true; -    forceSSL = true; -  }; - -  services.nginx.recommendedProxySettings = false; - -  services.prosody = { -    #extraModules = [ "muc_size2" ]; -    extraModules = [ "jitsi_bundled" ]; -    extraPluginPaths = [ -      (pkgs.copyPathToStore ../../../../playground/jitsi/plugins) -    ]; -    package = pkgs.prosody.override { -      withExtraLibs = with extraLua; [ basexx luajwtjitsi net-url ]; -    }; -  }; - - -} diff --git a/flora/services/cgit.nix b/flora/services/cgit.nix index f5ef52a..11c6d72 100644 --- a/flora/services/cgit.nix +++ b/flora/services/cgit.nix @@ -56,7 +56,7 @@ let    '';    cgit = pkgs.cgit.overrideAttrs (old: { -    patches = [./0001-main-instead-of-master-branch.patch]; +    patches = [ ./0001-main-instead-of-master-branch.patch ];    });  in  { diff --git a/flora/services/hedgedoc.nix b/flora/services/hedgedoc.nix deleted file mode 100644 index 038f99f..0000000 --- a/flora/services/hedgedoc.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ config, lib, pkgs, ... }: -let -  hedgedoc-patched = pkgs.hedgedoc.overrideAttrs (old: { -    src = pkgs.fetchgit { -      url = "https://stuebinm.eu/git/hedgedoc"; -      rev = "b0f98a43381486995b99ed79e0eabb3af149dbf3"; -      sha256 = "1199k5q8wampkw2ri4wgwzqgh1ff0l4kdxx9h8ywqy2f7faf922c"; -    }; -  }); -in -{ -    # Container containing CodiMD and its database -  # has its own internal network; needs a reverse-proxy to be reachable from the outside -  # TODO: persistent memory for pads -  containers.codimd = {  -    autoStart = true; -    privateNetwork = true; -    hostAddress6 = "fd00::42:10"; -    localAddress6 = "fd00::42:11"; -     -    config = {config, pkgs, ... }: { -      # open CodiMD port -      networking.firewall.allowedTCPPorts = [ config.services.hedgedoc.configuration.port ]; - -      # database (postgres 11), with default database reachable for CodiMD; no imperative config needed! -      services.postgresql = { -        enable = true; -        package = pkgs.postgresql_11; -        ensureDatabases = [ "codimd" ]; -        ensureUsers = [ { -          name = "hedgedoc"; -          ensurePermissions = { "DATABASE codimd" = "ALL PRIVILEGES";}; -        } ]; -        # ugly workaround to allow CodiMD to login without password — this service has lots of options, -        # but apparently not for authentification, which even needs to be forced … -        authentication = pkgs.lib.mkForce '' -          # Generated file; do not edit! -          local all all              trust -          host  codimd hedgedoc  ::1/18       trust -          host  codimd codimd ::1/128      trust -        ''; -      }; -      # CodiMD itself -      services.hedgedoc = { -        enable = true; -        workDir = "/var/codimd/"; -        configuration = { -          dbURL = "postgres:///codimd"; -          port = 3000; -          domain = "nix.stuebinm.eu"; -          urlAddPort = false; -          protocolUseSSL = true; -          allowPDFExport = true; -          host = "::"; -          allowEmailRegister = false; -          allowFreeURL = true; -          uploadsPath = "/var/codimd/uploads"; -          #email = false; -        }; -      }; - -      systemd.services.hedgedoc.serviceConfig.ExecStart = pkgs.lib.mkForce "${hedgedoc-patched}/bin/hedgedoc"; -    }; -  }; - -     -  networking.firewall.allowedTCPPorts = [ 80 443 ]; - -  services.nginx.virtualHosts."nix.stuebinm.eu" = { -    locations."/" = { -      proxyPass = "http://[" + config.containers.codimd.localAddress6 + "]:3000"; -      proxyWebsockets = true; -    }; -    forceSSL = true; -    enableACME = true; -  }; -} diff --git a/flora/services/surveys.nix b/flora/services/surveys.nix deleted file mode 100644 index befa673..0000000 --- a/flora/services/surveys.nix +++ /dev/null @@ -1,23 +0,0 @@ -{pkgs, config, ...}: - -let survey = pkgs.fetchgit { -      url = "https://stuebinm.eu/git/slightly-better-surveys"; -      rev = "c255269db0c739400b62d4c4041e3238b1045d22"; -      sha256 = "007q6s5xc3kn3dy1zj7hc94wyn495qam2x1020br3crwgpxy3hmp"; -    }; -in -{ -  services.nginx.virtualHosts."survey.stuebinm.eu" = { -    locations."/".root = survey.outPath + "/site"; -    locations."/upload".proxyPass = "http://localhost:8080"; - -    enableACME = true; -    forceSSL = true; -  }; - -  services.nginx.appendHttpConfig = '' -    types { -        application/wasm wasm; -    } -  ''; -} diff --git a/home/packages-minimal.nix b/home/packages-minimal.nix index 5fb1a2e..7adbadc 100644 --- a/home/packages-minimal.nix +++ b/home/packages-minimal.nix @@ -4,10 +4,6 @@ let      naersk = pkgs.callPackage inputs.naersk {};      extras = {          sfz = naersk.buildPackage inputs.sfz; -        leylines = pkgs.callPackage "${(pkgs.fetchgit { -            url = "https://gitlab.infra4future.de/stuebinm/leylines"; -            sha256 = "sha256-AFZVZeLPCWEjfUcILErag/J+susf7ovEQOg1RaFr4ko="; -        }).outPath}/package.nix" {};      };  in  { | 
