public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moodle: update to 3.9.1

Browse Source 
use phpEnv to provide xmlrpc
This commit is contained in:
Finn Behrens 2020-07-14 12:56:41 +02:00
parent 7561a3dc4a
commit 832d2289c3
No known key found for this signature in database
GPG Key ID: 8609A7B519E5E342
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/services/web-apps/moodle.nix
View File

@ -40,7 +40,7 @@ let
$CFG->disableupdateautodeploy = true; $CFG->disableupdateautodeploy = true;
$CFG->pathtogs = '${pkgs.ghostscript}/bin/gs'; $CFG->pathtogs = '${pkgs.ghostscript}/bin/gs';
$CFG->pathtophp = '${pkgs.php}/bin/php'; $CFG->pathtophp = '${phpExt}/bin/php';
$CFG->pathtodu = '${pkgs.coreutils}/bin/du'; $CFG->pathtodu = '${pkgs.coreutils}/bin/du';
$CFG->aspellpath = '${pkgs.aspell}/bin/aspell'; $CFG->aspellpath = '${pkgs.aspell}/bin/aspell';
$CFG->pathtodot = '${pkgs.graphviz}/bin/dot'; $CFG->pathtodot = '${pkgs.graphviz}/bin/dot';
@ -55,6 +55,9 @@ let
mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql"; mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql";
pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql";
phpExt = pkgs.php.withExtensions
({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo ]);
in in
{ {
# interface # interface
@ -222,6 +225,7 @@ in
services.phpfpm.pools.moodle = { services.phpfpm.pools.moodle = {
inherit user group; inherit user group;
phpPackage = phpExt;
phpEnv.MOODLE_CONFIG = "${moodleConfig}"; phpEnv.MOODLE_CONFIG = "${moodleConfig}";
phpOptions = '' phpOptions = ''
zend_extension = opcache.so zend_extension = opcache.so
@ -263,13 +267,13 @@ in
after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
environment.MOODLE_CONFIG = moodleConfig; environment.MOODLE_CONFIG = moodleConfig;
script = '' script = ''
${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/check_database_schema.php && rc=$? || rc=$? ${phpExt}/bin/php ${cfg.package}/share/moodle/admin/cli/check_database_schema.php && rc=$? || rc=$?
[ "$rc" == 1 ] && ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/upgrade.php \ [ "$rc" == 1 ] && ${phpExt}/bin/php ${cfg.package}/share/moodle/admin/cli/upgrade.php \
--non-interactive \ --non-interactive \
--allow-unstable --allow-unstable
[ "$rc" == 2 ] && ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/install_database.php \ [ "$rc" == 2 ] && ${phpExt}/bin/php ${cfg.package}/share/moodle/admin/cli/install_database.php \
--agree-license \ --agree-license \
--adminpass=${cfg.initialPassword} --adminpass=${cfg.initialPassword}
@ -289,7 +293,7 @@ in
serviceConfig = { serviceConfig = {
User = user; User = user;
Group = group; Group = group;
ExecStart = "${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/cron.php"; ExecStart = "${phpExt}/bin/php ${cfg.package}/share/moodle/admin/cli/cron.php";
}; };
}; };

2
pkgs/servers/web-apps/moodle/default.nix
View File

@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = url =
"https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
sha256 = "dffe8c1ac68938f50a987b46b0bfc74f01235d0198ac96fb4fc4f1df5bd7f4ea"; sha256 = "sha256-6QJDEInUQQSNj3kThQ65o2cT6JaRy0FrEKy+EcDMVvs=";
}; };
phpConfig = writeText "config.php" '' phpConfig = writeText "config.php" ''