Use new withPlugin system

- dokuwiki
- mantisbt
- mediagoblin
- roundcube
- ttrss
- yourls

7 files changed, 12 insertions, 10 deletions

diff --git a/modules/private/websites/tools/git/mantisbt.nix b/modules/private/websites/tools/git/mantisbt.nix
index 50851aa..a74d76e 100644
--- a/modules/private/websites/tools/git/mantisbt.nix
+++ b/modules/private/websites/tools/git/mantisbt.nix
@@ -46,7 +46,7 @@ rec {
       $g_ldap_organization = '${env.ldap.filter}';
     '';
   }];
-  webRoot = (mantisbt_2.override { mantis_config = "/var/secrets/webapps/tools-mantisbt"; }).withPlugins (builtins.attrValues mantisbt_2-plugins);
+  webRoot = (mantisbt_2.override { mantis_config = "/var/secrets/webapps/tools-mantisbt"; }).withPlugins (p: [p.slack p.source-integration]);
   apache = rec {
     user = "wwwrun";
     group = "wwwrun";
diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix
index 7d7904f..7c60ae4 100644
--- a/modules/private/websites/tools/mail/default.nix
+++ b/modules/private/websites/tools/mail/default.nix
@@ -1,7 +1,7 @@
 { lib, pkgs, config,  ... }:
 let
   roundcubemail = pkgs.callPackage ./roundcubemail.nix {
-    inherit (pkgs.webapps) roundcubemail roundcubemail-plugins roundcubemail-skins;
+    inherit (pkgs.webapps) roundcubemail;
     env = config.myEnv.tools.roundcubemail;
   };
   rainloop = pkgs.callPackage ./rainloop.nix {
diff --git a/modules/private/websites/tools/mail/roundcubemail.nix b/modules/private/websites/tools/mail/roundcubemail.nix
index 6875bae..bb7dee9 100644
--- a/modules/private/websites/tools/mail/roundcubemail.nix
+++ b/modules/private/websites/tools/mail/roundcubemail.nix
@@ -1,4 +1,4 @@
-{ env, roundcubemail, roundcubemail-plugins, roundcubemail-skins, apacheHttpd }:
+{ env, roundcubemail, apacheHttpd }:
 rec {
   varDir = "/var/lib/roundcubemail";
   activationScript = {
@@ -75,8 +75,7 @@ rec {
         $config['mime_types'] = '${apacheHttpd}/conf/mime.types';
     '';
   }];
-  webRoot = (roundcubemail.override { roundcube_config = "/var/secrets/webapps/tools-roundcube"; }).withPlugins
-    (builtins.attrValues roundcubemail-plugins) (builtins.attrValues roundcubemail-skins);
+  webRoot = (roundcubemail.override { roundcube_config = "/var/secrets/webapps/tools-roundcube"; }).withPlugins (p: [ p.automatic_addressbook p.carddav p.contextmenu p.contextmenu_folder p.html5_notifier p.ident_switch p.message_highlight p.thunderbird_labels ]);
   apache = rec {
     user = "wwwrun";
     group = "wwwrun";
diff --git a/modules/private/websites/tools/mgoblin/default.nix b/modules/private/websites/tools/mgoblin/default.nix
index 5224a0d..719d3d3 100644
--- a/modules/private/websites/tools/mgoblin/default.nix
+++ b/modules/private/websites/tools/mgoblin/default.nix
@@ -83,7 +83,7 @@ in {
 
     services.mediagoblin = {
       enable     = true;
-      plugins    = builtins.attrValues pkgs.webapps.mediagoblin-plugins;
+      package    = pkgs.webapps.mediagoblin.withPlugins (p: [p.basicsearch]);
       configFile = "/var/secrets/webapps/tools-mediagoblin";
     };
     services.filesWatcher.mediagoblin-web = {
diff --git a/modules/private/websites/tools/tools/dokuwiki.nix b/modules/private/websites/tools/tools/dokuwiki.nix
index 26c04b7..5290a96 100644
--- a/modules/private/websites/tools/tools/dokuwiki.nix
+++ b/modules/private/websites/tools/tools/dokuwiki.nix
@@ -19,7 +19,7 @@ rec {
       install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions
     '';
   };
-  webRoot = dokuwiki.withPlugins (builtins.attrValues dokuwiki-plugins);
+  webRoot = dokuwiki.withPlugins (p: [ p.farmer p.todo ]);
   apache = rec {
     user = "wwwrun";
     group = "wwwrun";
diff --git a/modules/private/websites/tools/tools/ttrss.nix b/modules/private/websites/tools/tools/ttrss.nix
index 48876d3..ce1ab8e 100644
--- a/modules/private/websites/tools/tools/ttrss.nix
+++ b/modules/private/websites/tools/tools/ttrss.nix
@@ -88,7 +88,11 @@ rec {
         define('LDAP_AUTH_DEBUG', FALSE);
       '';
   }];
-  webRoot = (ttrss.override { ttrss_config = "/var/secrets/webapps/tools-ttrss"; }).withPlugins (builtins.attrValues ttrss-plugins);
+  webRoot = (ttrss.override { ttrss_config = "/var/secrets/webapps/tools-ttrss"; }).withPlugins (p: [
+    p.auth_ldap p.ff_instagram p.tumblr_gdpr_ua
+    (p.af_feedmod.override { patched = true; })
+    (p.feediron.override { patched = true; })
+  ]);
   apache = rec {
     user = "wwwrun";
     group = "wwwrun";
diff --git a/modules/private/websites/tools/tools/yourls.nix b/modules/private/websites/tools/tools/yourls.nix
index cb03b6c..77ac0a3 100644
--- a/modules/private/websites/tools/tools/yourls.nix
+++ b/modules/private/websites/tools/tools/yourls.nix
@@ -40,8 +40,7 @@ rec {
       define( 'LDAPAUTH_USERCACHE_TYPE', 0);
     '';
   }];
-  webRoot = (yourls.override { yourls_config = "/var/secrets/webapps/tools-yourls"; }).withPlugins
-    (builtins.attrValues yourls-plugins);
+  webRoot = (yourls.override { yourls_config = "/var/secrets/webapps/tools-yourls"; }).withPlugins (p: [p.ldap]);
   apache = rec {
     user = "wwwrun";
     group = "wwwrun";