aboutsummaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
Diffstat (limited to 'nixos')
-rw-r--r--nixos/configurations/lipwig.nix2
-rw-r--r--nixos/modules/bcg.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/configurations/lipwig.nix b/nixos/configurations/lipwig.nix
index e6ec96a..8b1f3ee 100644
--- a/nixos/configurations/lipwig.nix
+++ b/nixos/configurations/lipwig.nix
@@ -104,8 +104,8 @@
root = "${pkgs.cgit}/cgit";
locations."/".tryFiles = "$uri @cgit";
locations."@cgit".extraConfig = ''
- fastcgi_param SCRIPT_FILENAME ${pkgs.cgit}/cgit/cgit.cgi;
fastcgi_pass unix:${config.services.fcgiwrap.socketAddress};
+ fastcgi_param SCRIPT_FILENAME ${pkgs.cgit}/cgit/cgit.cgi;
fastcgi_param PATH_INFO $uri;
fastcgi_param QUERY_STRING $args;
fastcgi_param HTTP_HOST $server_name;
diff --git a/nixos/modules/bcg.nix b/nixos/modules/bcg.nix
index 3146c15..ea89e3a 100644
--- a/nixos/modules/bcg.nix
+++ b/nixos/modules/bcg.nix
@@ -146,14 +146,14 @@ in {
envConfig = cfg.environmentFiles != [];
finalConfig =
if envConfig
- then "$RUNTIME_DIRECTORY/bcg.config.yaml"
+ then "\${RUNTIME_DIRECTORY}/bcg.config.yaml"
else configFile;
in {
description = "BigClown Gateway";
wantedBy = ["multi-user.target"];
wants = ["network-online.target"] ++ lib.optional config.services.mosquitto.enable "mosquitto.service";
after = ["network-online.target"];
- preStart = ''
+ preStart = mkIf envConfig ''
umask 077
${pkgs.envsubst}/bin/envsubst -i "${configFile}" -o "${finalConfig}"
'';