diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2014-09-01 16:08:44 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2014-09-01 16:21:12 +0200 |
| commit | 31b7cae0188a569867626068580d96dfbf3b3219 (patch) | |
| tree | 04d57f4fe077769815b0d28c803b8564256f5427 /nixos/modules/services/networking/znc.nix | |
| parent | 29f46422844b8f18f4905fc3f730abe0b5b494da (diff) | |
| download | nixlib-31b7cae0188a569867626068580d96dfbf3b3219.tar nixlib-31b7cae0188a569867626068580d96dfbf3b3219.tar.gz nixlib-31b7cae0188a569867626068580d96dfbf3b3219.tar.bz2 nixlib-31b7cae0188a569867626068580d96dfbf3b3219.tar.lz nixlib-31b7cae0188a569867626068580d96dfbf3b3219.tar.xz nixlib-31b7cae0188a569867626068580d96dfbf3b3219.tar.zst nixlib-31b7cae0188a569867626068580d96dfbf3b3219.zip | |
nixos/znc: fix immutable config.
Fix references to coreutils echo and rm. Make config writable even if immutable because of https://github.com/znc/znc/blob/master/src/znc.cpp#L964 .
Diffstat (limited to 'nixos/modules/services/networking/znc.nix')
| -rw-r--r-- | nixos/modules/services/networking/znc.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 5aed20ee3e0b..9b26b2b32448 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -274,20 +274,16 @@ in # If mutable, regenerate conf file every time. ${optionalString (!cfg.mutable) '' - ${pkgs.coreutils}/echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated." - ${pkgs.coreutils}/rm -f ${cfg.dataDir}/configs/znc.conf + ${pkgs.coreutils}/bin/echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated." + ${pkgs.coreutils}/bin/rm -f ${cfg.dataDir}/configs/znc.conf ''} # Ensure essential files exist. if [[ ! -f ${cfg.dataDir}/configs/znc.conf ]]; then - ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now." - ${if (!cfg.mutable) - then "${pkgs.coreutils}/bin/ln --force -s ${zncConfFile} ${cfg.dataDir}/.znc/configs/znc.conf" - else '' - ${pkgs.coreutils}/bin/cp --no-clobber ${zncConfFile} ${cfg.dataDir}/configs/znc.conf - ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf - ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf - ''} + ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now." + ${pkgs.coreutils}/bin/cp --no-clobber ${zncConfFile} ${cfg.dataDir}/configs/znc.conf + ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf + ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf fi if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then |