diff options
Diffstat (limited to 'nixops/modules/websites/tools/tools/yourls.nix')
-rw-r--r-- | nixops/modules/websites/tools/tools/yourls.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixops/modules/websites/tools/tools/yourls.nix b/nixops/modules/websites/tools/tools/yourls.nix index 390dabe..470fb7b 100644 --- a/nixops/modules/websites/tools/tools/yourls.nix +++ b/nixops/modules/websites/tools/tools/yourls.nix | |||
@@ -13,8 +13,8 @@ let | |||
13 | activationScript = '' | 13 | activationScript = '' |
14 | install -m 0755 -o ${apache.user} -g ${apache.group} -d /var/lib/php/sessions/yourls | 14 | install -m 0755 -o ${apache.user} -g ${apache.group} -d /var/lib/php/sessions/yourls |
15 | ''; | 15 | ''; |
16 | keys.tools-yourls = { | 16 | keys = [{ |
17 | destDir = "/run/keys/webapps"; | 17 | dest = "webapps/tools-yourls"; |
18 | user = apache.user; | 18 | user = apache.user; |
19 | group = apache.group; | 19 | group = apache.group; |
20 | permissions = "0400"; | 20 | permissions = "0400"; |
@@ -46,13 +46,13 @@ let | |||
46 | 46 | ||
47 | define( 'LDAPAUTH_USERCACHE_TYPE', 0); | 47 | define( 'LDAPAUTH_USERCACHE_TYPE', 0); |
48 | ''; | 48 | ''; |
49 | }; | 49 | }]; |
50 | webRoot = stdenv.mkDerivation (fetchedGithub ./yourls.json // rec { | 50 | webRoot = stdenv.mkDerivation (fetchedGithub ./yourls.json // rec { |
51 | installPhase = '' | 51 | installPhase = '' |
52 | mkdir -p $out | 52 | mkdir -p $out |
53 | cp -a */ *.php $out/ | 53 | cp -a */ *.php $out/ |
54 | cp sample-robots.txt $out/robots.txt | 54 | cp sample-robots.txt $out/robots.txt |
55 | ln -sf /run/keys/webapps/tools-yourls $out/includes/config.php | 55 | ln -sf /var/secrets/webapps/tools-yourls $out/includes/config.php |
56 | ${builtins.concatStringsSep "\n" ( | 56 | ${builtins.concatStringsSep "\n" ( |
57 | lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/user/plugins/${name}") plugins | 57 | lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/user/plugins/${name}") plugins |
58 | )} | 58 | )} |
@@ -85,9 +85,9 @@ let | |||
85 | ''; | 85 | ''; |
86 | }; | 86 | }; |
87 | phpFpm = rec { | 87 | phpFpm = rec { |
88 | serviceDeps = [ "mysql.service" "openldap.service" "tools-yourls-key.service" ]; | 88 | serviceDeps = [ "mysql.service" "openldap.service" ]; |
89 | basedir = builtins.concatStringsSep ":" ( | 89 | basedir = builtins.concatStringsSep ":" ( |
90 | [ webRoot "/run/keys/webapps/tools-yourls" ] | 90 | [ webRoot "/var/secrets/webapps/tools-yourls" ] |
91 | ++ lib.attrsets.mapAttrsToList (name: value: value) plugins); | 91 | ++ lib.attrsets.mapAttrsToList (name: value: value) plugins); |
92 | socket = "/var/run/phpfpm/yourls.sock"; | 92 | socket = "/var/run/phpfpm/yourls.sock"; |
93 | pool = '' | 93 | pool = '' |