diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2011-10-06 15:09:11 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2011-10-06 15:09:11 +0200 |
| commit | 593938dba97e1b101bfb21d24f4028230d5a1cc8 (patch) | |
| tree | 53f71330761a84811685ed7c7a9b6ecd7d493cbe | |
| parent | 9ec00e457a192cdaeddd753617c5b1a8126001ec (diff) | |
Fix and improve support for local override.
| -rwxr-xr-x | localnotifypwexp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/localnotifypwexp b/localnotifypwexp index 0d7845f..2ea686e 100755 --- a/localnotifypwexp +++ b/localnotifypwexp @@ -91,8 +91,10 @@ the account should be disabled or deleted.' # ### END MAIL TEMPLATES ### # allow overrides (especially userbodytemplate) -declare -r localconfig=/etc/local/notifypwexp -if [ -r /etc/default/$localconfig ]; then . /etc/default/$localconfig; fi +declare -r orgconfig=local-ORG/notifypwexp +declare -r hostconfig=local/notifypwexp +[ ! -r /etc/$orgconfig ] || . /etc/$orgconfig +[ ! -r /etc/$hostconfig ] || . /etc/$hostconfig # get real users users=$($awkprog -F: -v uidfield=$uidfield \ |