Merge pull request #672 from darko-poljak/sysctl-support-sysctl.d
__sysctl: support sysctl.d
This commit is contained in:
commit
f9892e25a3
2 changed files with 28 additions and 1 deletions
25
cdist/conf/type/__sysctl/explorer/conf-path
Executable file
25
cdist/conf/type/__sysctl/explorer/conf-path
Executable file
|
@ -0,0 +1,25 @@
|
||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# 2018 Darko Poljak (darko.poljak at gmail.com)
|
||||||
|
#
|
||||||
|
# This file is part of cdist.
|
||||||
|
#
|
||||||
|
# cdist is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# cdist is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
|
||||||
|
if [ -d "/etc/sysctl.d" ]; then
|
||||||
|
echo "/etc/sysctl.d/99-Z-sysctl-cdist.conf";
|
||||||
|
else
|
||||||
|
echo "/etc/sysctl.conf";
|
||||||
|
fi
|
|
@ -32,8 +32,10 @@ case "$os" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
conf_path=$(cat "$__object/explorer/conf-path")
|
||||||
|
|
||||||
__key_value "$__object_name" \
|
__key_value "$__object_name" \
|
||||||
--key "$__object_id" \
|
--key "$__object_id" \
|
||||||
--file /etc/sysctl.conf \
|
--file "${conf_path}" \
|
||||||
--value "$(cat "$__object/parameter/value")" \
|
--value "$(cat "$__object/parameter/value")" \
|
||||||
--delimiter '='
|
--delimiter '='
|
||||||
|
|
Loading…
Reference in a new issue