From 1a64deeb894dc95e2645a75771732c6cc53a79ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 4 Oct 2023 01:35:06 +0200 Subject: Squash changes containing private information There were a lot of changes since the previous commit, but a lot of them contained personnal information about users. All thos changes got stashed into a single commit (history is kept in a different place) and private information was moved in a separate private repository --- .../private/websites/tools/commento/default.nix | 59 ---------------------- 1 file changed, 59 deletions(-) delete mode 100644 modules/private/websites/tools/commento/default.nix (limited to 'modules/private/websites/tools/commento/default.nix') diff --git a/modules/private/websites/tools/commento/default.nix b/modules/private/websites/tools/commento/default.nix deleted file mode 100644 index c36255b..0000000 --- a/modules/private/websites/tools/commento/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, pkgs, config, ... }: -let - cfg = config.myServices.websites.tools.commento; - env = config.myEnv.tools.commento; - webPort = "${host}:${port}"; - port = toString env.listenPort; - host = "localhost"; - postgresql_url = "postgres://${env.postgresql.user}:${env.postgresql.password}@localhost:${env.postgresql.port}/${env.postgresql.database}?sslmode=disable"; -in -{ - options.myServices.websites.tools.commento = { - enable = lib.mkEnableOption "Enable commento website"; - }; - config = lib.mkIf cfg.enable { - secrets.keys = { - "commento/env" = { - permissions = "0400"; - text = '' - COMMENTO_ORIGIN=https://commento.immae.eu/ - COMMENTO_PORT=${port} - COMMENTO_POSTGRES=${postgresql_url} - COMMENTO_FORBID_NEW_OWNERS=true - COMMENTO_BIND_ADDRESS=${host} - COMMENTO_GZIP_STATIC=true - COMMENTO_SMTP_HOST=${env.smtp.host} - COMMENTO_SMTP_PORT=${env.smtp.port} - COMMENTO_SMTP_USERNAME=${env.smtp.email} - COMMENTO_SMTP_PASSWORD=${env.smtp.password} - COMMENTO_SMTP_FROM_ADDRESS=${env.smtp.email} - ''; - }; - }; - - services.websites.env.tools.vhostConfs.commento = { - certName = "eldiron"; - addToCerts = true; - hosts = [ "commento.immae.eu" ]; - root = null; - extraConfig = [ - '' - ProxyPass / http://${webPort}/ - ProxyPassReverse / http://${webPort}/ - ProxyPreserveHost On - '' - ]; - }; - systemd.services.commento = { - description = "Commento"; - wantedBy = [ "multi-user.target" ]; - requires = ["postgresql.service"]; - after = ["network.target" "postgresql.service"]; - serviceConfig = { - User = "wwwrun"; - ExecStart = "${pkgs.commento}/commento"; - EnvironmentFile = config.secrets.fullPaths."commento/env"; - }; - }; - }; -} -- cgit v1.2.3