From b330be28c330904e4f446e2f1d25d86b5ea7a048 Mon Sep 17 00:00:00 2001 From: Maurice Debray Date: Wed, 18 May 2022 22:19:54 +0200 Subject: [PATCH 01/12] ajout du dokuwiki sans les secrets --- machines/core-services-01/subZone.nix | 1 + machines/public-cof/configuration.nix | 1 + machines/public-cof/secrets/default.nix | 7 +- machines/public-cof/wiki.nix | 165 ++++++++++++++++++++++++ 4 files changed, 173 insertions(+), 1 deletion(-) create mode 100644 machines/public-cof/wiki.nix diff --git a/machines/core-services-01/subZone.nix b/machines/core-services-01/subZone.nix index 08db8c1..6fea47b 100644 --- a/machines/core-services-01/subZone.nix +++ b/machines/core-services-01/subZone.nix @@ -69,6 +69,7 @@ dualstack // { }; docs = public-cof-ips; jurisprudens = public-cof-ips; + wiki = public-cof-ips; }; }; diff --git a/machines/public-cof/configuration.nix b/machines/public-cof/configuration.nix index ef33c32..60b6d58 100644 --- a/machines/public-cof/configuration.nix +++ b/machines/public-cof/configuration.nix @@ -17,6 +17,7 @@ ./cryptpad.nix ./hedgedoc.nix ./secrets + ./wiki.nix # TODO monitoring ]; diff --git a/machines/public-cof/secrets/default.nix b/machines/public-cof/secrets/default.nix index a7cd5ea..acfa396 100644 --- a/machines/public-cof/secrets/default.nix +++ b/machines/public-cof/secrets/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ config, ... }: { age.secrets.nextcloudAdminPassword = { owner = "nextcloud"; @@ -10,4 +10,9 @@ group = "nextcloud"; file = ./nextcloudDatabasePasswordFile.age; }; + age.secrets.wikiKeycloakSecret = { + owner = "dokuwiki"; + group = config.services.nginx.group; + file = ./wikiKeycloakSecret.age; + }; } diff --git a/machines/public-cof/wiki.nix b/machines/public-cof/wiki.nix new file mode 100644 index 0000000..5062781 --- /dev/null +++ b/machines/public-cof/wiki.nix @@ -0,0 +1,165 @@ +{ pkgs, config, ... }: +let + hostname = "new.hackens.org"; #config.my.subZone; + debug = false; #config.my.debug; +in +{ + imports = [ + modules/custom-dokuwiki.nix + ]; + disabledModules = [ "services/web-apps/dokuwiki.nix" ]; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + services.nginx.virtualHosts."${hostname}" = { + enableACME = true; + forceSSL = true; + }; + services.dokuwiki.sites."${hostname}" = { + enable = true; + + extraConfig = '' + $conf['template'] = 'bootstrap3'; + $conf['license'] = 'cc-by-sa'; + $conf['title'] = 'hackEns'; + $conf['start'] = 'accueil'; + $conf['lang'] = 'fr'; + $conf['breadcrumbs'] = 0; // On s'en fiche de l'historique des pages visitées + $conf['youarehere'] = true; // Par contre on veut notre position dans la hiérarchie du site + // On veut que les liens externes s'ouvrent dans de nouveaux onglets + $conf['target'] = array( + 'extern' => '_tab' + ); + $conf['htmlok'] = 1; // On peut mettre du html dans les pages + $conf['sitemap'] = 7; + $conf['rss_type'] = 'rss2'; + $conf['userewrite'] = 1; // Important, sinon on casse tout avec les règles nginx définies par le module nixos + $conf['useslash'] = 1; + $conf['plugin']['tokenbucketauth']['tba_send_mail'] = 'hackens@clipper.ens.fr'; // Ban auto des IPs qui brute-forcent + $conf['tpl']['bootstrap3']['showAddNewPage'] = 'logged'; + $conf['tpl']['bootstrap3']['fluidContainer'] = 0; + $conf['htmlmail'] = 0; // On envoie les mails en plain text + $conf['authtype'] = 'oauth'; + $conf['plugin']['oauthkeycloak']['key'] = 'wiki'; + $conf['plugin']['oauthkeycloak']['secret'] = file_get_contents('${config.age.secrets.wikiKeycloakSecret.path}', length=36); + $conf['plugin']['oauthkeycloak']['openidurl'] = 'https://auth.rz.ens.wtf/auth/realms/hackENS/.well-known/openid-configuration/'; + ''; + + pluginsConfig = '' + $plugins['authmysql'] = 0; + $plugins['popularity'] = 0; + $plugins['authpgsql'] = 0; + $plugins['authpdo'] = 0; + $plugins['authldap'] = 0; + $plugins['oauthkeycloak'] = 1; + ''; + + disableActions = "register"; + superUser = "@admin"; + + aclUse = true; + + # Il faut packager les templates + templates = let + template-bootstrap3 = { version, logo, favicon, apple-touch-icon, dokuwikiPath }: + pkgs.stdenv.mkDerivation { + name = "bootstrap3"; + # Download the theme from the dokuwiki site + src = pkgs.fetchFromGitHub version; + # We need unzip to build this package + # buildInputs = [ pkgs.unzip ]; + # Installing simply means copying all files to the output directory + installPhase = '' + mkdir -p $out + cp -R * $out/ + rm $out/images/logo.png + rm $out/images/favicon.ico + rm $out/images/apple-touch-icon.png + ln -s ${logo} $out/images/logo.png + ln -s ${favicon} $out/images/favicon.ico + ln -s ${apple-touch-icon} $out/images/apple-touch-icon.png + echo " $out/doku_inc.php # Lien vers le dokuwiki + ''; + }; + # And then pass this theme to the template list like this: + in [ + (template-bootstrap3 { + version = { + owner = "giterlizzi"; + repo = "dokuwiki-template-bootstrap3"; + rev="v2020-07-29"; + sha256="05d6si1lci3a2pgd10iwpwrgl969y7gq4qsn5p1lbgxkraad17af"; + }; + logo = ./media/logo.png; + favicon = ./media/favicon.ico; + apple-touch-icon = ./media/logo.png; + dokuwikiPath = "${config.services.dokuwiki.sites."${hostname}".finalPackage}/share/dokuwiki"; + }) + ]; + plugins = [ + (pkgs.stdenv.mkDerivation { + name = "commonmark"; + # Download the theme from the dokuwiki site + src = pkgs.fetchzip { + url = "https://github.com/clockoon/dokuwiki-plugin-commonmark/releases/download/v1.2.0/release.tar.gz"; + sha256 = "10SVyqkbkwzF/m4aTHB/ssXJK5rjQbLxYOAFDKYOxTY="; + }; + # Installing simply means copying all files to the output directory + installPhase = '' + mkdir -p $out + cp -R * $out/ + ''; + }) + (pkgs.stdenv.mkDerivation { + name = "catlist"; + # Download the theme from the dokuwiki site + src = pkgs.fetchFromGitHub { + owner = "xif-fr"; + repo = "dokuwiki-plugin-catlist"; + rev = "065f8d2f4817409989b9342b901163452fb9f547"; + sha256 = "1l7bvnqkai8qkqqb67w8yy7fbs30dviqc36pyqggzfjhi558i9ih"; + }; + # Installing simply means copying all files to the output directory + installPhase = '' + mkdir -p $out + cp -R * $out/ + ''; + }) + (pkgs.stdenv.mkDerivation { + name = "oauth"; + # Download the theme from the dokuwiki site + src = pkgs.fetchFromGitHub { + owner = "cosmocode"; + repo = "dokuwiki-plugin-oauth"; + rev = "2022-01-13"; + sha256 = "ruaw8MqSMgopULD7vxed44nbowjVc1e4H0Q7JEL9pD0="; + }; + # Installing simply means copying all files to the output directory + installPhase = '' + mkdir -p $out + cp -R * $out/ + ''; + }) + (pkgs.stdenv.mkDerivation { + name = "oauthkeycloak"; + # Download the theme from the dokuwiki site + src = pkgs.fetchFromGitHub { + owner = "YoitoFes"; + repo = "dokuwiki-plugin-oauthkeycloak"; + rev = "2022-12-23"; + sha256 = "jV4CCVJ+4vbWE52ocsJnHR5oIM5ZM/5aYub6wxkVado="; + }; + # Installing simply means copying all files to the output directory + installPhase = '' + mkdir -p $out + cp -R * $out/ + ''; + }) + ]; + }; + # On veut php-xml + services.phpfpm.pools."dokuwiki-${hostname}".phpPackage = pkgs.lib.mkForce ( pkgs.php74.withExtensions ( + { all, enabled, ... }: + enabled ++ [ + all.xml + ] + )); +} -- 2.46.1 From 38023011f93585f71ac682e72b110e7337d1bf9f Mon Sep 17 00:00:00 2001 From: sinavir Date: Wed, 18 May 2022 22:48:44 +0200 Subject: [PATCH 02/12] finalisation des secrets --- machines/public-cof/secrets/secrets.nix | 1 + machines/public-cof/secrets/wikiKeycloakSecret.age | 0 2 files changed, 1 insertion(+) create mode 100644 machines/public-cof/secrets/wikiKeycloakSecret.age diff --git a/machines/public-cof/secrets/secrets.nix b/machines/public-cof/secrets/secrets.nix index 4fe0e66..a36b9eb 100644 --- a/machines/public-cof/secrets/secrets.nix +++ b/machines/public-cof/secrets/secrets.nix @@ -9,5 +9,6 @@ in { "nextcloudAdminPasswordFile.age".publicKeys = superadmins ++ systems; "nextcloudDatabasePasswordFile.age".publicKeys = superadmins ++ systems; + "wikiKeycloakSecret.age".publicKeys = superadmins ++ systems; } diff --git a/machines/public-cof/secrets/wikiKeycloakSecret.age b/machines/public-cof/secrets/wikiKeycloakSecret.age new file mode 100644 index 0000000..e69de29 -- 2.46.1 From 2236f8a1ebc17d172bd1415a11c060d94688badf Mon Sep 17 00:00:00 2001 From: sinavir Date: Wed, 18 May 2022 22:50:43 +0200 Subject: [PATCH 03/12] bugfix --- machines/public-cof/wiki.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/machines/public-cof/wiki.nix b/machines/public-cof/wiki.nix index 5062781..ab62500 100644 --- a/machines/public-cof/wiki.nix +++ b/machines/public-cof/wiki.nix @@ -4,10 +4,6 @@ let debug = false; #config.my.debug; in { - imports = [ - modules/custom-dokuwiki.nix - ]; - disabledModules = [ "services/web-apps/dokuwiki.nix" ]; networking.firewall.allowedTCPPorts = [ 80 443 ]; services.nginx.virtualHosts."${hostname}" = { enableACME = true; -- 2.46.1 From 60c8f69de4c1bb90ed0b7106024b8d5c608549b3 Mon Sep 17 00:00:00 2001 From: sinavir Date: Wed, 18 May 2022 22:53:22 +0200 Subject: [PATCH 04/12] bugfix bis --- machines/public-cof/wiki.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/machines/public-cof/wiki.nix b/machines/public-cof/wiki.nix index ab62500..725647a 100644 --- a/machines/public-cof/wiki.nix +++ b/machines/public-cof/wiki.nix @@ -66,12 +66,6 @@ in installPhase = '' mkdir -p $out cp -R * $out/ - rm $out/images/logo.png - rm $out/images/favicon.ico - rm $out/images/apple-touch-icon.png - ln -s ${logo} $out/images/logo.png - ln -s ${favicon} $out/images/favicon.ico - ln -s ${apple-touch-icon} $out/images/apple-touch-icon.png echo " $out/doku_inc.php # Lien vers le dokuwiki ''; }; -- 2.46.1 From b72961040e593a212ce975977e283cc4a5feb312 Mon Sep 17 00:00:00 2001 From: sinavir Date: Wed, 18 May 2022 23:01:01 +0200 Subject: [PATCH 05/12] bugfix ter --- machines/public-cof/wiki.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/public-cof/wiki.nix b/machines/public-cof/wiki.nix index 725647a..af66b36 100644 --- a/machines/public-cof/wiki.nix +++ b/machines/public-cof/wiki.nix @@ -134,7 +134,7 @@ in src = pkgs.fetchFromGitHub { owner = "YoitoFes"; repo = "dokuwiki-plugin-oauthkeycloak"; - rev = "2022-12-23"; + rev = "2021-12-23"; sha256 = "jV4CCVJ+4vbWE52ocsJnHR5oIM5ZM/5aYub6wxkVado="; }; # Installing simply means copying all files to the output directory -- 2.46.1 From 32a3c85d79899568c95205021e55200f8baadca9 Mon Sep 17 00:00:00 2001 From: sinavir Date: Wed, 18 May 2022 23:13:03 +0200 Subject: [PATCH 06/12] Title --- machines/public-cof/wiki.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/public-cof/wiki.nix b/machines/public-cof/wiki.nix index af66b36..3e5d30c 100644 --- a/machines/public-cof/wiki.nix +++ b/machines/public-cof/wiki.nix @@ -15,7 +15,7 @@ in extraConfig = '' $conf['template'] = 'bootstrap3'; $conf['license'] = 'cc-by-sa'; - $conf['title'] = 'hackEns'; + $conf['title'] = 'Infrastructure du klubrezo'; $conf['start'] = 'accueil'; $conf['lang'] = 'fr'; $conf['breadcrumbs'] = 0; // On s'en fiche de l'historique des pages visitées -- 2.46.1 From 6ca57b5cc9cde56c9470c76f24b09ab335db7b72 Mon Sep 17 00:00:00 2001 From: Maurice Debray Date: Sun, 22 May 2022 12:19:41 +0200 Subject: [PATCH 07/12] Module dokuwiki plus propre --- machines/public-cof/wiki.nix | 111 +++++------------------------------ 1 file changed, 16 insertions(+), 95 deletions(-) diff --git a/machines/public-cof/wiki.nix b/machines/public-cof/wiki.nix index 3e5d30c..209c0ea 100644 --- a/machines/public-cof/wiki.nix +++ b/machines/public-cof/wiki.nix @@ -1,7 +1,10 @@ { pkgs, config, ... }: let - hostname = "new.hackens.org"; #config.my.subZone; - debug = false; #config.my.debug; + hostname = "wiki.beta.rz.ens.wtf"; + keycloakKey = "wiki"; + keycloakUrl = "https://auth.rz.ens.wtf/auth/realms/ClubReseau/.well-known/openid-configuration/"; + keycloakSecretFile = config.age.secrets.wikiKeycloakSecret.path; + title = "Wiki du KlubRezo"; in { networking.firewall.allowedTCPPorts = [ 80 443 ]; @@ -15,7 +18,7 @@ in extraConfig = '' $conf['template'] = 'bootstrap3'; $conf['license'] = 'cc-by-sa'; - $conf['title'] = 'Infrastructure du klubrezo'; + $conf['title'] = '${title}'; $conf['start'] = 'accueil'; $conf['lang'] = 'fr'; $conf['breadcrumbs'] = 0; // On s'en fiche de l'historique des pages visitées @@ -29,14 +32,13 @@ in $conf['rss_type'] = 'rss2'; $conf['userewrite'] = 1; // Important, sinon on casse tout avec les règles nginx définies par le module nixos $conf['useslash'] = 1; - $conf['plugin']['tokenbucketauth']['tba_send_mail'] = 'hackens@clipper.ens.fr'; // Ban auto des IPs qui brute-forcent $conf['tpl']['bootstrap3']['showAddNewPage'] = 'logged'; $conf['tpl']['bootstrap3']['fluidContainer'] = 0; $conf['htmlmail'] = 0; // On envoie les mails en plain text $conf['authtype'] = 'oauth'; - $conf['plugin']['oauthkeycloak']['key'] = 'wiki'; - $conf['plugin']['oauthkeycloak']['secret'] = file_get_contents('${config.age.secrets.wikiKeycloakSecret.path}', length=36); - $conf['plugin']['oauthkeycloak']['openidurl'] = 'https://auth.rz.ens.wtf/auth/realms/hackENS/.well-known/openid-configuration/'; + $conf['plugin']['oauthkeycloak']['key'] = '${keycloakKey}'; + $conf['plugin']['oauthkeycloak']['secret'] = rtrim(file_get_contents('${keycloakSecretFile}')); + $conf['plugin']['oauthkeycloak']['openidurl'] = '${keycloakUrl}'; ''; pluginsConfig = '' @@ -54,102 +56,21 @@ in aclUse = true; # Il faut packager les templates - templates = let - template-bootstrap3 = { version, logo, favicon, apple-touch-icon, dokuwikiPath }: - pkgs.stdenv.mkDerivation { - name = "bootstrap3"; - # Download the theme from the dokuwiki site - src = pkgs.fetchFromGitHub version; - # We need unzip to build this package - # buildInputs = [ pkgs.unzip ]; - # Installing simply means copying all files to the output directory - installPhase = '' - mkdir -p $out - cp -R * $out/ - echo " $out/doku_inc.php # Lien vers le dokuwiki - ''; - }; - # And then pass this theme to the template list like this: + templates = in [ - (template-bootstrap3 { - version = { - owner = "giterlizzi"; - repo = "dokuwiki-template-bootstrap3"; - rev="v2020-07-29"; - sha256="05d6si1lci3a2pgd10iwpwrgl969y7gq4qsn5p1lbgxkraad17af"; - }; - logo = ./media/logo.png; - favicon = ./media/favicon.ico; - apple-touch-icon = ./media/logo.png; - dokuwikiPath = "${config.services.dokuwiki.sites."${hostname}".finalPackage}/share/dokuwiki"; - }) + pkgs.dokuwikiExtensions.templates.bootstrap3 ]; plugins = [ - (pkgs.stdenv.mkDerivation { - name = "commonmark"; - # Download the theme from the dokuwiki site - src = pkgs.fetchzip { - url = "https://github.com/clockoon/dokuwiki-plugin-commonmark/releases/download/v1.2.0/release.tar.gz"; - sha256 = "10SVyqkbkwzF/m4aTHB/ssXJK5rjQbLxYOAFDKYOxTY="; - }; - # Installing simply means copying all files to the output directory - installPhase = '' - mkdir -p $out - cp -R * $out/ - ''; - }) - (pkgs.stdenv.mkDerivation { - name = "catlist"; - # Download the theme from the dokuwiki site - src = pkgs.fetchFromGitHub { - owner = "xif-fr"; - repo = "dokuwiki-plugin-catlist"; - rev = "065f8d2f4817409989b9342b901163452fb9f547"; - sha256 = "1l7bvnqkai8qkqqb67w8yy7fbs30dviqc36pyqggzfjhi558i9ih"; - }; - # Installing simply means copying all files to the output directory - installPhase = '' - mkdir -p $out - cp -R * $out/ - ''; - }) - (pkgs.stdenv.mkDerivation { - name = "oauth"; - # Download the theme from the dokuwiki site - src = pkgs.fetchFromGitHub { - owner = "cosmocode"; - repo = "dokuwiki-plugin-oauth"; - rev = "2022-01-13"; - sha256 = "ruaw8MqSMgopULD7vxed44nbowjVc1e4H0Q7JEL9pD0="; - }; - # Installing simply means copying all files to the output directory - installPhase = '' - mkdir -p $out - cp -R * $out/ - ''; - }) - (pkgs.stdenv.mkDerivation { - name = "oauthkeycloak"; - # Download the theme from the dokuwiki site - src = pkgs.fetchFromGitHub { - owner = "YoitoFes"; - repo = "dokuwiki-plugin-oauthkeycloak"; - rev = "2021-12-23"; - sha256 = "jV4CCVJ+4vbWE52ocsJnHR5oIM5ZM/5aYub6wxkVado="; - }; - # Installing simply means copying all files to the output directory - installPhase = '' - mkdir -p $out - cp -R * $out/ - ''; - }) + pkgs.dokuwikiExtensions.plugins.commonmark + pkgs.dokuwikiExtensions.plugins.catlist + pkgs.dokuwikiExtensions.plugins.keycloak + pkgs.dokuwikiExtensions.plugins.oauth ]; }; - # On veut php-xml services.phpfpm.pools."dokuwiki-${hostname}".phpPackage = pkgs.lib.mkForce ( pkgs.php74.withExtensions ( { all, enabled, ... }: enabled ++ [ - all.xml + all.xml #Requis par le template bootstrap3 ] )); } -- 2.46.1 From de14b0cdf701fd8de4a23622f596347d9a1f2069 Mon Sep 17 00:00:00 2001 From: sinavir Date: Sun, 24 Jul 2022 22:27:48 +0200 Subject: [PATCH 08/12] import pkgs form nur, misc --- machines/public-cof/nix/sources.json | 2 +- machines/public-cof/nur.nix | 2 +- machines/public-cof/wiki.nix | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/machines/public-cof/nix/sources.json b/machines/public-cof/nix/sources.json index a6531e2..ef10812 100644 --- a/machines/public-cof/nix/sources.json +++ b/machines/public-cof/nix/sources.json @@ -14,7 +14,7 @@ "klubrz-nur": { "branch": "main", "repo": "https://git.rz.ens.wtf/Klub-RZ/nur", - "rev": "98911e21fd58f00440dc8a5bd6568f2a349338bd", + "rev": "c5d852f465933c5ed7e6cc98f8ddebc97c9fbcf9", "type": "git" }, "niv": { diff --git a/machines/public-cof/nur.nix b/machines/public-cof/nur.nix index 7ca9d89..119c503 100644 --- a/machines/public-cof/nur.nix +++ b/machines/public-cof/nur.nix @@ -6,7 +6,7 @@ let in { nixpkgs.config.packageOverrides = { - # rz = import rz-src { inherit pkgs; }; + rz = import rz-src { inherit pkgs; }; }; imports = [ diff --git a/machines/public-cof/wiki.nix b/machines/public-cof/wiki.nix index 209c0ea..26a7e79 100644 --- a/machines/public-cof/wiki.nix +++ b/machines/public-cof/wiki.nix @@ -37,8 +37,9 @@ in $conf['htmlmail'] = 0; // On envoie les mails en plain text $conf['authtype'] = 'oauth'; $conf['plugin']['oauthkeycloak']['key'] = '${keycloakKey}'; - $conf['plugin']['oauthkeycloak']['secret'] = rtrim(file_get_contents('${keycloakSecretFile}')); + $conf['plugin']['oauthkeycloak']['secret'] = file('${keycloakSecretFile}', FILE_IGNORE_NEW_LINES)[0]; $conf['plugin']['oauthkeycloak']['openidurl'] = '${keycloakUrl}'; + $conf['plugin']['oauth']['register-on-auth'] = 1; ''; pluginsConfig = '' @@ -56,10 +57,7 @@ in aclUse = true; # Il faut packager les templates - templates = - in [ - pkgs.dokuwikiExtensions.templates.bootstrap3 - ]; + templates = [ pkgs.dokuwikiExtensions.templates.bootstrap3 ]; plugins = [ pkgs.dokuwikiExtensions.plugins.commonmark pkgs.dokuwikiExtensions.plugins.catlist -- 2.46.1 From 8728b94b383f68782e827893e77fa8689512e6e6 Mon Sep 17 00:00:00 2001 From: sinavir Date: Mon, 25 Jul 2022 00:14:29 +0200 Subject: [PATCH 09/12] fixed nur source --- machines/public-cof/nix/sources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/public-cof/nix/sources.json b/machines/public-cof/nix/sources.json index ef10812..8cf3a73 100644 --- a/machines/public-cof/nix/sources.json +++ b/machines/public-cof/nix/sources.json @@ -12,7 +12,7 @@ "url_template": "https://github.com///archive/.tar.gz" }, "klubrz-nur": { - "branch": "main", + "branch": "custom_dokuwiki", "repo": "https://git.rz.ens.wtf/Klub-RZ/nur", "rev": "c5d852f465933c5ed7e6cc98f8ddebc97c9fbcf9", "type": "git" -- 2.46.1 From 362b4001cd60060e2831df68666d167719ddf818 Mon Sep 17 00:00:00 2001 From: sinavir Date: Mon, 25 Jul 2022 00:27:45 +0200 Subject: [PATCH 10/12] fix forgotten nur rz prefix --- machines/public-cof/wiki.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/machines/public-cof/wiki.nix b/machines/public-cof/wiki.nix index 26a7e79..3a1f893 100644 --- a/machines/public-cof/wiki.nix +++ b/machines/public-cof/wiki.nix @@ -57,12 +57,12 @@ in aclUse = true; # Il faut packager les templates - templates = [ pkgs.dokuwikiExtensions.templates.bootstrap3 ]; + templates = [ pkgs.rz.dokuwikiExtensions.templates.bootstrap3 ]; plugins = [ - pkgs.dokuwikiExtensions.plugins.commonmark - pkgs.dokuwikiExtensions.plugins.catlist - pkgs.dokuwikiExtensions.plugins.keycloak - pkgs.dokuwikiExtensions.plugins.oauth + pkgs.rz.dokuwikiExtensions.plugins.commonmark + pkgs.rz.dokuwikiExtensions.plugins.catlist + pkgs.rz.dokuwikiExtensions.plugins.keycloak + pkgs.rz.dokuwikiExtensions.plugins.oauth ]; }; services.phpfpm.pools."dokuwiki-${hostname}".phpPackage = pkgs.lib.mkForce ( pkgs.php74.withExtensions ( -- 2.46.1 From cfdcc10e60f3001c571381a39d797732d0859265 Mon Sep 17 00:00:00 2001 From: sinavir Date: Mon, 25 Jul 2022 00:42:28 +0200 Subject: [PATCH 11/12] updated nur sources for public cof in niv --- machines/public-cof/nix/sources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/public-cof/nix/sources.json b/machines/public-cof/nix/sources.json index 8cf3a73..99bc320 100644 --- a/machines/public-cof/nix/sources.json +++ b/machines/public-cof/nix/sources.json @@ -14,7 +14,7 @@ "klubrz-nur": { "branch": "custom_dokuwiki", "repo": "https://git.rz.ens.wtf/Klub-RZ/nur", - "rev": "c5d852f465933c5ed7e6cc98f8ddebc97c9fbcf9", + "rev": "de3dd70a88b30cc9a3caefe821794491807f2a7a", "type": "git" }, "niv": { -- 2.46.1 From 9949997af2aa063f690704957d421b53ccd309ce Mon Sep 17 00:00:00 2001 From: sinavir Date: Mon, 25 Jul 2022 00:53:26 +0200 Subject: [PATCH 12/12] updated nur sources for public cof in niv (bis) --- machines/public-cof/nix/sources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/public-cof/nix/sources.json b/machines/public-cof/nix/sources.json index 99bc320..9e44ff2 100644 --- a/machines/public-cof/nix/sources.json +++ b/machines/public-cof/nix/sources.json @@ -14,7 +14,7 @@ "klubrz-nur": { "branch": "custom_dokuwiki", "repo": "https://git.rz.ens.wtf/Klub-RZ/nur", - "rev": "de3dd70a88b30cc9a3caefe821794491807f2a7a", + "rev": "30e5da0c5eeede091c35f64d6a3720fd8e149d87", "type": "git" }, "niv": { -- 2.46.1