3 files changed, 71 insertions, 96 deletions

diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index e872224..95679f6 100644
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -23,7 +23,7 @@ let
       env = myconfig.env.tools.yourls;
     };
     rompr = pkgs.callPackage ./rompr.nix {
-      inherit (mylibs) fetchedGithub;
+      inherit (pkgs.webapps) rompr;
       env = myconfig.env.tools.rompr;
     };
     shaarli = pkgs.callPackage ./shaarli.nix {
diff --git a/nixops/modules/websites/tools/tools/rompr.json b/nixops/modules/websites/tools/tools/rompr.json
deleted file mode 100644
index 778d915..0000000
--- a/nixops/modules/websites/tools/tools/rompr.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "tag": "1.24",
-  "meta": {
-    "name": "rompr",
-    "url": "https://github.com/fatg3erman/RompR",
-    "branch": "refs/tags/1.24"
-  },
-  "github": {
-    "owner": "fatg3erman",
-    "repo": "RompR",
-    "rev": "0d8f597027ac71b320963fe3f33f461a136312ad",
-    "sha256": "13p3c4whhmvz1vvh9fva5gdx4xji288k108hjdi8b1yn506lzix2",
-    "fetchSubmodules": true
-  }
-}
diff --git a/nixops/modules/websites/tools/tools/rompr.nix b/nixops/modules/websites/tools/tools/rompr.nix
index ca93bea..fea59fc 100644
--- a/nixops/modules/websites/tools/tools/rompr.nix
+++ b/nixops/modules/websites/tools/tools/rompr.nix
@@ -1,87 +1,77 @@
-{ lib, env, stdenv, fetchedGithub }:
-let
-  rompr = let
-  in rec {
-    varDir = "/var/lib/rompr";
-    activationScript = ''
-      install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \
-        ${varDir}/prefs ${varDir}/albumart ${varDir}/phpSessions
-    '';
-    webRoot = stdenv.mkDerivation (fetchedGithub ./rompr.json // rec {
-      installPhase = ''
-        cp -a . $out
-        ln -sf ${varDir}/prefs $out/prefs
-        ln -sf ${varDir}/albumart $out/albumart
-      '';
-    });
-    apache = rec {
-      user = "wwwrun";
-      group = "wwwrun";
-      modules = [ "headers" "mime" "proxy_fcgi" ];
-      webappName = "tools_rompr";
-      root = "/run/current-system/webapps/${webappName}";
-      vhostConf = ''
-        Alias /rompr ${root}
+{ lib, env, rompr }:
+rec {
+  varDir = "/var/lib/rompr";
+  activationScript = ''
+    install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \
+      ${varDir}/prefs ${varDir}/albumart ${varDir}/phpSessions
+  '';
+  webRoot = rompr;
+  apache = rec {
+    user = "wwwrun";
+    group = "wwwrun";
+    modules = [ "headers" "mime" "proxy_fcgi" ];
+    webappName = "tools_rompr";
+    root = "/run/current-system/webapps/${webappName}";
+    vhostConf = ''
+      Alias /rompr ${root}
 
-        <Directory ${root}>
-          Options Indexes FollowSymLinks
-          DirectoryIndex index.php
-          AllowOverride all
-          Require all granted
-          Order allow,deny
-          Allow from all
-          ErrorDocument 404 /rompr/404.php
-          AddType image/x-icon .ico
+      <Directory ${root}>
+        Options Indexes FollowSymLinks
+        DirectoryIndex index.php
+        AllowOverride all
+        Require all granted
+        Order allow,deny
+        Allow from all
+        ErrorDocument 404 /rompr/404.php
+        AddType image/x-icon .ico
 
-          <FilesMatch "\.php$">
-            SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
-          </FilesMatch>
-        </Directory>
+        <FilesMatch "\.php$">
+          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+        </FilesMatch>
+      </Directory>
 
-        <Directory ${root}/albumart/small>
-            Header Set Cache-Control "max-age=0, no-store"
-            Header Set Cache-Control "no-cache, must-revalidate"
-        </Directory>
+      <Directory ${root}/albumart/small>
+          Header Set Cache-Control "max-age=0, no-store"
+          Header Set Cache-Control "no-cache, must-revalidate"
+      </Directory>
 
-        <Directory ${root}/albumart/asdownloaded>
-            Header Set Cache-Control "max-age=0, no-store"
-            Header Set Cache-Control "no-cache, must-revalidate"
-        </Directory>
+      <Directory ${root}/albumart/asdownloaded>
+          Header Set Cache-Control "max-age=0, no-store"
+          Header Set Cache-Control "no-cache, must-revalidate"
+      </Directory>
 
-        <LocationMatch "^/rompr">
-          Use LDAPConnect
-          Require ldap-group   cn=users,cn=mpd,ou=services,dc=immae,dc=eu
-        </LocationMatch>
-        '';
-    };
-    phpFpm = rec {
-      basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
-      socket = "/var/run/phpfpm/rompr.sock";
-      pool = ''
-        listen = ${socket}
-        user = ${apache.user}
-        group = ${apache.group}
-        listen.owner = ${apache.user}
-        listen.group = ${apache.group}
-        pm = ondemand
-        pm.max_children = 60
-        pm.process_idle_timeout = 60
+      <LocationMatch "^/rompr">
+        Use LDAPConnect
+        Require ldap-group   cn=users,cn=mpd,ou=services,dc=immae,dc=eu
+      </LocationMatch>
+      '';
+  };
+  phpFpm = rec {
+    basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
+    socket = "/var/run/phpfpm/rompr.sock";
+    pool = ''
+      listen = ${socket}
+      user = ${apache.user}
+      group = ${apache.group}
+      listen.owner = ${apache.user}
+      listen.group = ${apache.group}
+      pm = ondemand
+      pm.max_children = 60
+      pm.process_idle_timeout = 60
 
-        ; Needed to avoid clashes in browser cookies (same domain)
-        php_value[session.name] = RomprPHPSESSID
-        php_admin_value[open_basedir] = "${basedir}:/tmp"
-        php_admin_value[session.save_path] = "${varDir}/phpSessions"
-        php_flag[magic_quotes_gpc] = Off
-        php_flag[track_vars] = On
-        php_flag[register_globals] = Off
-        php_admin_flag[allow_url_fopen] = On
-        php_value[include_path] = ${webRoot}
-        php_admin_value[upload_tmp_dir] = "${varDir}/prefs"
-        php_admin_value[post_max_size] = 32M
-        php_admin_value[upload_max_filesize] = 32M
-        php_admin_value[memory_limit] = 256M
-        '';
-    };
+      ; Needed to avoid clashes in browser cookies (same domain)
+      php_value[session.name] = RomprPHPSESSID
+      php_admin_value[open_basedir] = "${basedir}:/tmp"
+      php_admin_value[session.save_path] = "${varDir}/phpSessions"
+      php_flag[magic_quotes_gpc] = Off
+      php_flag[track_vars] = On
+      php_flag[register_globals] = Off
+      php_admin_flag[allow_url_fopen] = On
+      php_value[include_path] = ${webRoot}
+      php_admin_value[upload_tmp_dir] = "${varDir}/prefs"
+      php_admin_value[post_max_size] = 32M
+      php_admin_value[upload_max_filesize] = 32M
+      php_admin_value[memory_limit] = 256M
+      '';
   };
-in
-  rompr
+}