From a8bfce17c5eda890d3486357952572f4c1c6b18a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 8 May 2019 10:56:21 +0200 Subject: Move etherpad-lite to pkgs --- nixops/modules/websites/tools/ether/default.nix | 4 +- .../websites/tools/ether/etherpad-lite.json | 15 ---- .../modules/websites/tools/ether/etherpad_lite.nix | 80 ++-------------------- .../websites/tools/ether/libreoffice_patch.diff | 11 --- 4 files changed, 7 insertions(+), 103 deletions(-) delete mode 100644 nixops/modules/websites/tools/ether/etherpad-lite.json delete mode 100644 nixops/modules/websites/tools/ether/libreoffice_patch.diff (limited to 'nixops/modules/websites/tools') diff --git a/nixops/modules/websites/tools/ether/default.nix b/nixops/modules/websites/tools/ether/default.nix index 0d04c36..09e5c9d 100644 --- a/nixops/modules/websites/tools/ether/default.nix +++ b/nixops/modules/websites/tools/ether/default.nix @@ -1,7 +1,7 @@ { lib, pkgs, config, myconfig, mylibs, ... }: let etherpad = pkgs.callPackage ./etherpad_lite.nix { - inherit (mylibs) fetchedGithub; + inherit (pkgs.webapps) etherpad-lite etherpad-lite-modules; env = myconfig.env.tools.etherpad-lite; }; @@ -44,7 +44,7 @@ in { Restart = "always"; Type = "simple"; TimeoutSec = 60; - ExecStartPre = "+${pkgs.coreutils}/bin/chown etherpad-lite:etherpad-lite /var/secrets/webapps/tools-etherpad /var/secrets/webapps/tools-etherpad-sessionkey /var/secrets/webapps/tools-etherpad-apikey"; + ExecStartPre = "+${pkgs.coreutils}/bin/chown -R etherpad-lite:etherpad-lite /var/secrets/webapps/tools-etherpad /var/secrets/webapps/tools-etherpad-sessionkey /var/secrets/webapps/tools-etherpad-apikey"; }; }; diff --git a/nixops/modules/websites/tools/ether/etherpad-lite.json b/nixops/modules/websites/tools/ether/etherpad-lite.json deleted file mode 100644 index 81369c4..0000000 --- a/nixops/modules/websites/tools/ether/etherpad-lite.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "1.7.0", - "meta": { - "name": "etherpad-lite", - "url": "https://github.com/ether/etherpad-lite", - "branch": "refs/tags/1.7.0" - }, - "github": { - "owner": "ether", - "repo": "etherpad-lite", - "rev": "96ac381afb9ea731dad48968f15d77dc6488bd0d", - "sha256": "03k6bwlm9ch9kssy9jipfg8ij7rpbzd89xq4mvg4grg1q6ivnzk9", - "fetchSubmodules": true - } -} diff --git a/nixops/modules/websites/tools/ether/etherpad_lite.nix b/nixops/modules/websites/tools/ether/etherpad_lite.nix index e67497b..35220ee 100644 --- a/nixops/modules/websites/tools/ether/etherpad_lite.nix +++ b/nixops/modules/websites/tools/ether/etherpad_lite.nix @@ -1,35 +1,8 @@ -{ env, fetchedGithub, fetchurl, stdenv, writeText, pkgs, cacert }: +{ env, etherpad-lite, etherpad-lite-modules, writeText, pkgs }: let listenPort = env.listenPort; sessionkey = writeText "SESSIONKEY.txt" env.session_key; apikey = writeText "APIKEY.txt" env.api_key; - jquery = fetchurl { - url = https://code.jquery.com/jquery-1.9.1.js; - sha256 = "0h4dk67yc9d0kadqxb6b33585f3x3559p6qmp70l00qwq030vn3v"; - }; - etherpad_modules = [ - "ep_aa_file_menu_toolbar" - "ep_adminpads" - "ep_align" - "ep_bookmark" - "ep_clear_formatting" - "ep_colors" - "ep_copy_paste_select_all" - "ep_cursortrace" - "ep_embedmedia" - "ep_font_family" - "ep_font_size" - "ep_headings2" - "ep_ldapauth" - "ep_line_height" - "ep_markdown" - "ep_previewimages" - "ep_ruler" - "ep_scrollto" - "ep_set_title_on_pad" - "ep_subscript_and_superscript" - "ep_timesliderdiff" - ]; keys = [ { dest = "webapps/tools-etherpad-apikey"; @@ -146,53 +119,10 @@ let ''; } ]; - webappDir = stdenv.mkDerivation (fetchedGithub ./etherpad-lite.json // rec { - __noChroot = true; - patches = [ ./libreoffice_patch.diff ]; - buildPhase = '' - export GIT_SSL_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt - export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt - export HOME=$PWD - - touch src/.ep_initialized - cp -v src/static/custom/js.template src/static/custom/index.js - cp -v src/static/custom/js.template src/static/custom/pad.js - cp -v src/static/custom/js.template src/static/custom/timeslider.js - cp -v src/static/custom/css.template src/static/custom/index.css - cp -v src/static/custom/css.template src/static/custom/pad.css - cp -v src/static/custom/css.template src/static/custom/timeslider.css - - sed -i 's/var\/dirty.db/\/var\/lib\/etherpad-lite\/dirty.db/g' \ - settings.json.template - - mkdir -v node_modules - ln -s ../src node_modules/ep_etherpad-lite - - node bin/doc/generate doc/index.md --format=html \ - --template=doc/template.html > documentation.html - - cd src - npm install - cd .. - ${builtins.concatStringsSep "\n" - (map (n: "npm install ${n}; touch node_modules/${n}/.ep_initialized") etherpad_modules)} - ''; - installPhase = '' - mkdir -p $out - install -t $out/src/ -vDm 644 src/.ep_initialized - cp -a node_modules $out/ - cp -a src/* $out/src/ - ln -sf /var/secrets/webapps/tools-etherpad-sessionkey $out/SESSIONKEY.txt - ln -sf /var/secrets/webapps/tools-etherpad-apikey $out/APIKEY.txt - cp ${jquery} $out/src/static/js/jquery.js - - mkdir $out/doc - install -t "$out/doc/" \ - -vDm 644 {CHANGELOG,CONTRIBUTING,README}.md \ - -vDm 644 documentation.html - ''; - buildInputs = [ pkgs.nodejs pkgs.python ]; - }); + webappDir = (etherpad-lite.override { + session_key = "/var/secrets/webapps/tools-etherpad-sessionkey"; + api_key = "/var/secrets/webapps/tools-etherpad-apikey"; + }).withModules etherpad-lite-modules; in { inherit webappDir keys listenPort; diff --git a/nixops/modules/websites/tools/ether/libreoffice_patch.diff b/nixops/modules/websites/tools/ether/libreoffice_patch.diff deleted file mode 100644 index d9e3dfc..0000000 --- a/nixops/modules/websites/tools/ether/libreoffice_patch.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/node/utils/LibreOffice.js 2018-06-18 09:54:15.087161212 +0200 -+++ b/src/node/utils/LibreOffice.js 2018-06-18 10:33:27.534055021 +0200 -@@ -63,6 +63,7 @@ - '--invisible', - '--nologo', - '--nolockcheck', -+ '-env:UserInstallation=file:///tmp/', - '--convert-to', task.type, - task.srcFile, - '--outdir', tmpDir - -- cgit v1.2.3