Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ce7ed91093b7
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 364e1a8ca917
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Aug 14, 2019

  1. nixos/oxidized: Use symlinks for config files 

    The old `cp` suffers from a permission issue on the 2nd start of the
service. The files were copied from the read-only nix store. On the 2nd
start of the service the `cp` failed.
The new version force creates a symlink which does not suffer from this.

(cherry picked from commit 02dfc07)
    @WilliButz
    Tristan Helmich (omniIT) authored and WilliButz committed Aug 14, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: CA4106B8D7CC79FA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    364e1a8 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/modules/services/admin/oxidized.nix
4 changes: 2 additions & 2 deletions nixos/modules/services/admin/oxidized.nix
View file
Original file line number Diff line number Diff line change
@@ -97,8 +97,8 @@ in

preStart = ''
mkdir -p ${cfg.dataDir}/.config/oxidized
cp -v ${cfg.routerDB} ${cfg.dataDir}/.config/oxidized/router.db
cp -v ${cfg.configFile} ${cfg.dataDir}/.config/oxidized/config
ln -f -s ${cfg.routerDB} ${cfg.dataDir}/.config/oxidized/router.db
ln -f -s ${cfg.configFile} ${cfg.dataDir}/.config/oxidized/config
'';

serviceConfig = {