diff options
| author | Dennis Camera <cdist@dtnr.ch> | 2021-04-06 18:41:30 +0200 |
|---|---|---|
| committer | Dennis Camera <cdist@dtnr.ch> | 2021-04-06 18:45:24 +0200 |
| commit | a70cbb2693ebd0b6ac5fc3da7d15b558d8bffd15 (patch) | |
| tree | 871278974a8165c3263fd79156236ae9b54c304c | |
| parent | 92d82cf9fa89e61837e8e8f6bd4bf77e6b48282e (diff) | |
| download | __dtnrch_getssl-a70cbb2693ebd0b6ac5fc3da7d15b558d8bffd15.tar.gz __dtnrch_getssl-a70cbb2693ebd0b6ac5fc3da7d15b558d8bffd15.zip | |
[type/__dtnrch_getssl/script_*] Add special case for Debian and setgid /usr/local
| -rwxr-xr-x | type/__dtnrch_getssl_script_cpanel/manifest | 15 | ||||
| -rwxr-xr-x | type/__dtnrch_getssl_script_henet/manifest | 15 |
2 files changed, 26 insertions, 4 deletions
diff --git a/type/__dtnrch_getssl_script_cpanel/manifest b/type/__dtnrch_getssl_script_cpanel/manifest index 54ed560..bd7d9af 100755 --- a/type/__dtnrch_getssl_script_cpanel/manifest +++ b/type/__dtnrch_getssl_script_cpanel/manifest @@ -23,9 +23,20 @@ state_should=$(cat "${__object:?}/parameter/state") case ${state_should} in (present) + case $(cat "${__global:?}/explorer/os") + in + (debian|devuan|ubuntu) + # /usr/local is setgid staff + script_dirmode=2775 + ;; + (*) + script_dirmode=0775 + ;; + esac + require=__dtnrch_getssl/ \ - __directory "${SCRIPTS_DIR}" --state present \ - --owner 0 --mode 0775 --parents + __directory "${SCRIPTS_DIR}" --state present --parents \ + --owner 0 --mode "${script_dirmode}" ;; (absent) ;; diff --git a/type/__dtnrch_getssl_script_henet/manifest b/type/__dtnrch_getssl_script_henet/manifest index f600858..2e212b0 100755 --- a/type/__dtnrch_getssl_script_henet/manifest +++ b/type/__dtnrch_getssl_script_henet/manifest @@ -59,9 +59,20 @@ esac case ${state_should} in (present) + case $(cat "${__global:?}/explorer/os") + in + (debian|devuan|ubuntu) + # /usr/local is setgid staff + script_dirmode=2775 + ;; + (*) + script_dirmode=0775 + ;; + esac + require=__dtnrch_getssl/ \ - __directory "${SCRIPTS_DIR}" --state present \ - --owner 0 --mode 0775 --parents + __directory "${SCRIPTS_DIR}" --state present --parents \ + --owner 0 --mode "${script_dirmode}" export require="__directory${SCRIPTS_DIR}" |