From eb190677ac9a4fc77afb5543417255119600fb01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 7 Mar 2019 12:36:02 +0100 Subject: Migrate capitaines.fr --- nixops/modules/websites/capitaines/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'nixops') diff --git a/nixops/modules/websites/capitaines/default.nix b/nixops/modules/websites/capitaines/default.nix index 8073955..08f6dd3 100644 --- a/nixops/modules/websites/capitaines/default.nix +++ b/nixops/modules/websites/capitaines/default.nix @@ -13,16 +13,17 @@ in { }; config = lib.mkIf cfg.production.enable { - security.acme.certs."capitaines_mastodon" = config.services.myCertificates.certConfig // { + security.acme.certs."capitaines" = config.services.myCertificates.certConfig // { domain = "mastodon.capitaines.fr"; + extraDomains = { "capitaines.fr" = null; }; }; system.extraSystemBuilderCmds = '' mkdir -p $out/webapps ln -s ${siteDir} $out/webapps/${webappName} ''; - services.myWebsites.production.vhostConfs.capitaines = { - certName = "capitaines_mastodon"; + services.myWebsites.production.vhostConfs.capitaines_mastodon = { + certName = "capitaines"; hosts = [ "mastodon.capitaines.fr" ]; root = root; extraConfig = [ @@ -36,5 +37,17 @@ in { '' ]; }; + + services.myWebsites.production.vhostConfs.capitaines = { + certName = "capitaines"; + hosts = [ "capitaines.fr" ]; + root = "/run/current-system/webapps/_www"; + extraConfig = [ '' + + DirectoryIndex index.htm + Require all granted + + '' ]; + }; }; } -- cgit v1.2.3