diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-23 01:57:14 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-23 01:57:14 +0200 |
| commit | 4917a4f8b3d3dee315c9e640f54f3e94c30663c4 (patch) | |
| tree | 3fb60a1d8ddc16bca981c892ebae6d6b139d4c1f /nixos/modules/services | |
| parent | cf787f028246fbf7c66c4d5482b9966d3f5745ff (diff) | |
| parent | c76f0104509c20dae008a2782981d6188e981ca5 (diff) | |
| download | nixlib-4917a4f8b3d3dee315c9e640f54f3e94c30663c4.tar nixlib-4917a4f8b3d3dee315c9e640f54f3e94c30663c4.tar.gz nixlib-4917a4f8b3d3dee315c9e640f54f3e94c30663c4.tar.bz2 nixlib-4917a4f8b3d3dee315c9e640f54f3e94c30663c4.tar.lz nixlib-4917a4f8b3d3dee315c9e640f54f3e94c30663c4.tar.xz nixlib-4917a4f8b3d3dee315c9e640f54f3e94c30663c4.tar.zst nixlib-4917a4f8b3d3dee315c9e640f54f3e94c30663c4.zip | |
Merge master into staging
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/misc/parsoid.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/networking/asterisk.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix index 0844190a5490..ea97d6e30e83 100644 --- a/nixos/modules/services/misc/parsoid.nix +++ b/nixos/modules/services/misc/parsoid.nix @@ -91,7 +91,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - ExecStart = "${pkgs.nodePackages.parsoid}/lib/node_modules/parsoid/api/server.js -c ${confFile} -n ${toString cfg.workers}"; + ExecStart = "${pkgs.nodePackages_0_10.parsoid}/lib/node_modules/parsoid/api/server.js -c ${confFile} -n ${toString cfg.workers}"; }; }; diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix index b079cb227303..13617a1b6c58 100644 --- a/nixos/modules/services/networking/asterisk.nix +++ b/nixos/modules/services/networking/asterisk.nix @@ -201,6 +201,7 @@ in for d in '${varlibdir}' '${spooldir}' '${logdir}'; do # TODO: Make exceptions for /var directories that likely should be updated if [ ! -e "$d" ]; then + mkdir -p "$d" cp --recursive ${pkgs.asterisk}/"$d" "$d" chown --recursive ${asteriskUser} "$d" find "$d" -type d | xargs chmod 0755 |