aboutsummaryrefslogtreecommitdiff
path: root/nixops
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-07 00:01:09 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-07 00:01:09 +0200
commitc9d13ae319b4f01202a1afad046c3c1add1cc7ba (patch)
tree5552225ea95941d1273ce2b6e9e63884933f28ba /nixops
parentf61d1c7cb908ab83cffe962cc73f1a86e692b6e5 (diff)
downloadNix-c9d13ae319b4f01202a1afad046c3c1add1cc7ba.tar.gz
Nix-c9d13ae319b4f01202a1afad046c3c1add1cc7ba.tar.zst
Nix-c9d13ae319b4f01202a1afad046c3c1add1cc7ba.zip
Move dokuwiki to pkgs
Diffstat (limited to 'nixops')
-rw-r--r--nixops/modules/websites/tools/tools/default.nix2
-rw-r--r--nixops/modules/websites/tools/tools/dokuwiki-plugin-farmer.json15
-rw-r--r--nixops/modules/websites/tools/tools/dokuwiki-plugin-todo.json15
-rw-r--r--nixops/modules/websites/tools/tools/dokuwiki.json15
-rw-r--r--nixops/modules/websites/tools/tools/dokuwiki.nix157
5 files changed, 59 insertions, 145 deletions
diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index 95679f6..1d459b7 100644
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -30,7 +30,7 @@ let
30 env = myconfig.env.tools.shaarli; 30 env = myconfig.env.tools.shaarli;
31 }; 31 };
32 dokuwiki = pkgs.callPackage ./dokuwiki.nix { 32 dokuwiki = pkgs.callPackage ./dokuwiki.nix {
33 inherit (mylibs) fetchedGithub; 33 inherit (pkgs.webapps) dokuwiki dokuwiki-plugins;
34 }; 34 };
35 ldap = pkgs.callPackage ./ldap.nix { 35 ldap = pkgs.callPackage ./ldap.nix {
36 inherit (pkgs.webapps) phpldapadmin; 36 inherit (pkgs.webapps) phpldapadmin;
diff --git a/nixops/modules/websites/tools/tools/dokuwiki-plugin-farmer.json b/nixops/modules/websites/tools/tools/dokuwiki-plugin-farmer.json
deleted file mode 100644
index 4022eb4..0000000
--- a/nixops/modules/websites/tools/tools/dokuwiki-plugin-farmer.json
+++ /dev/null
@@ -1,15 +0,0 @@
1{
2 "tag": "72b8577-master",
3 "meta": {
4 "name": "dokuwiki-plugin-farmer",
5 "url": "https://github.com/cosmocode/dokuwiki-plugin-farmer",
6 "branch": "master"
7 },
8 "github": {
9 "owner": "cosmocode",
10 "repo": "dokuwiki-plugin-farmer",
11 "rev": "72b857734fd164bf79cc6e17abe56491d55c1072",
12 "sha256": "1c9vc1z7yvzjz4p054kshb9yd00a4bb52s43k9zav0lvwvjij9l0",
13 "fetchSubmodules": true
14 }
15}
diff --git a/nixops/modules/websites/tools/tools/dokuwiki-plugin-todo.json b/nixops/modules/websites/tools/tools/dokuwiki-plugin-todo.json
deleted file mode 100644
index 9576826..0000000
--- a/nixops/modules/websites/tools/tools/dokuwiki-plugin-todo.json
+++ /dev/null
@@ -1,15 +0,0 @@
1{
2 "tag": "49068ec-master",
3 "meta": {
4 "name": "dokuwiki-plugin-todo",
5 "url": "https://github.com/leibler/dokuwiki-plugin-todo",
6 "branch": "master"
7 },
8 "github": {
9 "owner": "leibler",
10 "repo": "dokuwiki-plugin-todo",
11 "rev": "49068ecea455ea997d1e4a7adab171ccaf8228e8",
12 "sha256": "1jaq623kp14fyhamsas5mk9ryqlk4q6x6znijrb5xhcdg3r83gmq",
13 "fetchSubmodules": true
14 }
15}
diff --git a/nixops/modules/websites/tools/tools/dokuwiki.json b/nixops/modules/websites/tools/tools/dokuwiki.json
deleted file mode 100644
index fc03252..0000000
--- a/nixops/modules/websites/tools/tools/dokuwiki.json
+++ /dev/null
@@ -1,15 +0,0 @@
1{
2 "tag": "release_stable_2018-04-22b",
3 "meta": {
4 "name": "dokuwiki",
5 "url": "https://github.com/splitbrain/dokuwiki",
6 "branch": "refs/tags/release_stable_2018-04-22b"
7 },
8 "github": {
9 "owner": "splitbrain",
10 "repo": "dokuwiki",
11 "rev": "871dae1320b40211626c7ec665f5e6d5290aca95",
12 "sha256": "1syvd5dvv3v75swf8ig7dxqs0g5xikb0f6vlcy7g4c4ghldkw7nz",
13 "fetchSubmodules": true
14 }
15}
diff --git a/nixops/modules/websites/tools/tools/dokuwiki.nix b/nixops/modules/websites/tools/tools/dokuwiki.nix
index 2cd19f1..c61d15f 100644
--- a/nixops/modules/websites/tools/tools/dokuwiki.nix
+++ b/nixops/modules/websites/tools/tools/dokuwiki.nix
@@ -1,102 +1,61 @@
1{ lib, php, stdenv, writeText, fetchedGithub }: 1{ lib, stdenv, dokuwiki, dokuwiki-plugins }:
2let 2rec {
3 dokuwiki = let 3 varDir = "/var/lib/dokuwiki";
4 plugins = { 4 activationScript = {
5 farmer = stdenv.mkDerivation (fetchedGithub ./dokuwiki-plugin-farmer.json // rec { 5 deps = [ "wrappers" ];
6 installPhase = '' 6 text = ''
7 mkdir $out 7 if [ ! -d ${varDir} ]; then
8 cp -a * $out/ 8 install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \
9 ''; 9 ${varDir}/animals
10 }); 10 cp -a ${webRoot}/conf.dist ${varDir}/conf
11 todo = stdenv.mkDerivation (fetchedGithub ./dokuwiki-plugin-todo.json // rec { 11 cp -a ${webRoot}/data.dist ${varDir}/data
12 installPhase = '' 12 cp -a ${webRoot}/
13 mkdir $out 13 chown -R ${apache.user}:${apache.user} ${varDir}/config ${varDir}/data
14 cp -a * $out/ 14 chmod -R 755 ${varDir}/config ${varDir}/data
15 ''; 15 fi
16 }); 16 install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions
17 }; 17 '';
18 preload = writeText "preload.php" '' 18 };
19 <?php 19 webRoot = dokuwiki.withPlugins (builtins.attrValues dokuwiki-plugins);
20 # farm setup by farmer plugin 20 apache = rec {
21 if(file_exists('${plugins.farmer}/DokuWikiFarmCore.php')) 21 user = "wwwrun";
22 { 22 group = "wwwrun";
23 include('${plugins.farmer}/DokuWikiFarmCore.php'); 23 modules = [ "proxy_fcgi" ];
24 } 24 webappName = "tools_dokuwiki";
25 ''; 25 root = "/run/current-system/webapps/${webappName}";
26 in rec { 26 vhostConf = ''
27 varDir = "/var/lib/dokuwiki"; 27 Alias /dokuwiki "${root}"
28 activationScript = { 28 <Directory "${root}">
29 deps = [ "wrappers" ]; 29 DirectoryIndex index.php
30 text = '' 30 <FilesMatch "\.php$">
31 if [ ! -d ${varDir} ]; then 31 SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
32 install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \ 32 </FilesMatch>
33 ${varDir}/animals
34 cp -a ${webRoot}/conf.dist ${varDir}/conf
35 cp -a ${webRoot}/data.dist ${varDir}/data
36 cp -a ${webRoot}/
37 chown -R ${apache.user}:${apache.user} ${varDir}/config ${varDir}/data
38 chmod -R 755 ${varDir}/config ${varDir}/data
39 fi
40 install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions
41 '';
42 };
43 webRoot = stdenv.mkDerivation (fetchedGithub ./dokuwiki.json // rec {
44 buildPhase = ''
45 mv conf conf.dist
46 mv data data.dist
47 '';
48 installPhase = ''
49 cp -a . $out
50 cp ${preload} $out/inc/preload.php
51 ln -sf ${varDir}/{conf,data} $out/
52 ln -sf ${varDir}/conf/.htaccess $out/
53 ${builtins.concatStringsSep "\n" (
54 lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/lib/plugins/${name}") plugins
55 )}
56 '';
57 });
58 apache = rec {
59 user = "wwwrun";
60 group = "wwwrun";
61 modules = [ "proxy_fcgi" ];
62 webappName = "tools_dokuwiki";
63 root = "/run/current-system/webapps/${webappName}";
64 vhostConf = ''
65 Alias /dokuwiki "${root}"
66 <Directory "${root}">
67 DirectoryIndex index.php
68 <FilesMatch "\.php$">
69 SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
70 </FilesMatch>
71 33
72 AllowOverride All 34 AllowOverride All
73 Options +FollowSymlinks 35 Options +FollowSymlinks
74 Require all granted 36 Require all granted
75 </Directory> 37 </Directory>
76 ''; 38 '';
77 }; 39 };
78 phpFpm = rec { 40 phpFpm = rec {
79 serviceDeps = [ "openldap.service" ]; 41 serviceDeps = [ "openldap.service" ];
80 basedir = builtins.concatStringsSep ":" ( 42 basedir = builtins.concatStringsSep ":" (
81 [ webRoot varDir ] 43 [ webRoot varDir ] ++ webRoot.plugins);
82 ++ lib.attrsets.mapAttrsToList (name: value: value) plugins); 44 socket = "/var/run/phpfpm/dokuwiki.sock";
83 socket = "/var/run/phpfpm/dokuwiki.sock"; 45 pool = ''
84 pool = '' 46 listen = ${socket}
85 listen = ${socket} 47 user = ${apache.user}
86 user = ${apache.user} 48 group = ${apache.group}
87 group = ${apache.group} 49 listen.owner = ${apache.user}
88 listen.owner = ${apache.user} 50 listen.group = ${apache.group}
89 listen.group = ${apache.group} 51 pm = ondemand
90 pm = ondemand 52 pm.max_children = 60
91 pm.max_children = 60 53 pm.process_idle_timeout = 60
92 pm.process_idle_timeout = 60
93 54
94 ; Needed to avoid clashes in browser cookies (same domain) 55 ; Needed to avoid clashes in browser cookies (same domain)
95 php_value[session.name] = DokuwikiPHPSESSID 56 php_value[session.name] = DokuwikiPHPSESSID
96 php_admin_value[open_basedir] = "${basedir}:/tmp" 57 php_admin_value[open_basedir] = "${basedir}:/tmp"
97 php_admin_value[session.save_path] = "${varDir}/phpSessions" 58 php_admin_value[session.save_path] = "${varDir}/phpSessions"
98 ''; 59 '';
99 };
100 }; 60 };
101in 61}
102 dokuwiki