Compare commits
No commits in common. "master" and "new-type__xymon_server" have entirely different histories.
master
...
new-type__
27 changed files with 106 additions and 714 deletions
|
|
@ -1,6 +1,7 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
|
||||
# 2010-2014 Nico Schottelius (nico-cdist at schottelius.org)
|
||||
# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
|
||||
#
|
||||
# This file is part of cdist.
|
||||
#
|
||||
|
|
@ -18,12 +19,7 @@
|
|||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
#
|
||||
# Retrieve the running hostname
|
||||
#
|
||||
|
||||
if command -v hostname >/dev/null
|
||||
then
|
||||
hostname
|
||||
else
|
||||
uname -n
|
||||
if command -v uname >/dev/null; then
|
||||
uname -n
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -15,10 +15,6 @@ case $os in
|
|||
# Differntation not needed anymore
|
||||
apt_source_distribution=stable
|
||||
;;
|
||||
10*)
|
||||
# Differntation not needed anymore
|
||||
apt_source_distribution=stable
|
||||
;;
|
||||
*)
|
||||
echo "Don't know how to install Grafana on $os $os_version. Send us a pull request!" >&2
|
||||
exit 1
|
||||
|
|
@ -33,9 +29,10 @@ case $os in
|
|||
--uri https://packages.grafana.com/oss/deb \
|
||||
--distribution $apt_source_distribution \
|
||||
--component main
|
||||
|
||||
__package apt-transport-https
|
||||
require="$require __apt_source/grafana" __apt_update_index
|
||||
require="$require __package/apt-transport-https __apt_update_index" __package grafana
|
||||
|
||||
require="$require __apt_source/grafana __package/apt-transport-https" __package grafana
|
||||
require="$require __package/grafana" __start_on_boot grafana-server
|
||||
require="$require __start_on_boot/grafana-server" __process grafana-server --start "service grafana-server start"
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -21,4 +21,4 @@
|
|||
# Check whether system has hostnamectl
|
||||
#
|
||||
|
||||
command -v hostnamectl 2>/dev/null || true
|
||||
command -v hostnamectl || true
|
||||
|
|
|
|||
23
cdist/conf/type/__sensible_editor/explorer/user_home → cdist/conf/type/__hostname/explorer/hostname_file
Normal file → Executable file
23
cdist/conf/type/__sensible_editor/explorer/user_home → cdist/conf/type/__hostname/explorer/hostname_file
Normal file → Executable file
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
#!/bin/sh
|
||||
#
|
||||
# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
|
||||
# 2014 Nico Schottelius (nico-cdist at schottelius.org)
|
||||
#
|
||||
# This file is part of cdist.
|
||||
#
|
||||
|
|
@ -11,23 +11,20 @@
|
|||
#
|
||||
# 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
|
||||
# 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/>.
|
||||
#
|
||||
#
|
||||
# Determines the home folder of the target user.
|
||||
# Retrieve the contents of /etc/hostname
|
||||
#
|
||||
|
||||
user=$__object_id
|
||||
home=$(getent passwd "${user}" | cut -d':' -f6)
|
||||
|
||||
if ! test -d "${home}"
|
||||
then
|
||||
echo "Cannot find home directory of user ${user}" >&2
|
||||
exit 1
|
||||
# Almost any distribution
|
||||
if [ -f /etc/hostname ]; then
|
||||
cat /etc/hostname
|
||||
# SuSE
|
||||
elif [ -f /etc/HOSTNAME ]; then
|
||||
cat /etc/HOSTNAME
|
||||
fi
|
||||
|
||||
echo "${home}"
|
||||
14
cdist/conf/type/__sensible_editor/explorer/group → cdist/conf/type/__hostname/explorer/hostname_sysconfig
Normal file → Executable file
14
cdist/conf/type/__sensible_editor/explorer/group → cdist/conf/type/__hostname/explorer/hostname_sysconfig
Normal file → Executable file
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
#!/bin/sh
|
||||
#
|
||||
# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
|
||||
# 2014 Nico Schottelius (nico-cdist at schottelius.org)
|
||||
#
|
||||
# This file is part of cdist.
|
||||
#
|
||||
|
|
@ -11,16 +11,16 @@
|
|||
#
|
||||
# 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
|
||||
# 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/>.
|
||||
#
|
||||
#
|
||||
# Determines the primary group of the user.
|
||||
# Retrieve the contents of /etc/hostname
|
||||
#
|
||||
|
||||
user=$__object_id
|
||||
|
||||
id -gn "${user}" 2>/dev/null
|
||||
if [ -f /etc/sysconfig/network ]; then
|
||||
awk -F= '/^HOSTNAME=/ { print $2 }' /etc/sysconfig/network
|
||||
fi
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
command -v getconf >/dev/null || exit 0
|
||||
|
||||
val=$(getconf HOST_NAME_MAX 2>/dev/null) || exit 0
|
||||
|
||||
if test -n "${val}" -a "${val}" != 'undefined'
|
||||
then
|
||||
echo "${val}"
|
||||
fi
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
#
|
||||
# 2014-2017 Steven Armstrong (steven-cdist at armstrong.cc)
|
||||
# 2014 Nico Schottelius (nico-cdist at schottelius.org)
|
||||
# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
|
||||
#
|
||||
# This file is part of cdist.
|
||||
#
|
||||
|
|
@ -20,81 +19,60 @@
|
|||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
os=$(cat "$__global/explorer/os")
|
||||
name_running=$(cat "$__global/explorer/hostname")
|
||||
has_hostnamectl=$(cat "$__object/explorer/has_hostnamectl")
|
||||
|
||||
|
||||
if test -s "$__object/parameter/name"
|
||||
then
|
||||
name_should=$(cat "$__object/parameter/name")
|
||||
if [ -f "$__object/parameter/name" ]; then
|
||||
name_should="$(cat "$__object/parameter/name")"
|
||||
else
|
||||
case $os
|
||||
in
|
||||
# RedHat-derivatives and BSDs
|
||||
centos|fedora|redhat|scientific|freebsd|macosx|netbsd|openbsd)
|
||||
# Hostname is FQDN
|
||||
name_should="${__target_host}"
|
||||
;;
|
||||
*)
|
||||
# Hostname is only first component of FQDN
|
||||
name_should="${__target_host%%.*}"
|
||||
;;
|
||||
esac
|
||||
name_should="${__target_host%%.*}"
|
||||
fi
|
||||
|
||||
os=$(cat "$__global/explorer/os")
|
||||
name_running=$(cat "$__global/explorer/hostname")
|
||||
name_config=$(cat "$__object/explorer/hostname_file")
|
||||
name_sysconfig=$(cat "$__object/explorer/hostname_sysconfig")
|
||||
has_hostnamectl=$(cat "$__object/explorer/has_hostnamectl")
|
||||
|
||||
################################################################################
|
||||
# Check if the (running) hostname is already correct
|
||||
# If everything is ok -> exit
|
||||
#
|
||||
test "$name_running" != "$name_should" || exit 0
|
||||
|
||||
case "$os" in
|
||||
archlinux|debian|suse|ubuntu|devuan|coreos|alpine)
|
||||
if [ "$name_config" = "$name_should" ] && [ "$name_running" = "$name_should" ]; then
|
||||
exit 0
|
||||
fi
|
||||
;;
|
||||
scientific|centos|freebsd|openbsd)
|
||||
if [ "$name_sysconfig" = "$name_should" ] && [ "$name_running" = "$name_should" ]; then
|
||||
exit 0
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "Unsupported os: $os" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
################################################################################
|
||||
# Setup hostname
|
||||
#
|
||||
echo 'changed' >>"$__messages_out"
|
||||
echo changed >> "$__messages_out"
|
||||
|
||||
# Use the good old way to set the hostname.
|
||||
case $os
|
||||
in
|
||||
alpine|debian|devuan|ubuntu)
|
||||
echo 'hostname -F /etc/hostname'
|
||||
# Use the good old way to set the hostname even on machines running systemd.
|
||||
case "$os" in
|
||||
archlinux|debian|ubuntu|devuan|centos|coreos|alpine)
|
||||
printf "printf '%%s\\\\n' '$name_should' > /etc/hostname\\n"
|
||||
echo "hostname -F /etc/hostname"
|
||||
;;
|
||||
archlinux)
|
||||
echo 'command -v hostnamectl >/dev/null 2>&1' \
|
||||
"&& hostnamectl set-hostname '$name_should'" \
|
||||
"|| hostname '$name_should'"
|
||||
;;
|
||||
centos|fedora|redhat|scientific|freebsd|netbsd|openbsd|gentoo|void)
|
||||
freebsd|openbsd)
|
||||
echo "hostname '$name_should'"
|
||||
;;
|
||||
macosx)
|
||||
echo "scutil --set HostName '$name_should'"
|
||||
;;
|
||||
solaris)
|
||||
echo "uname -S '$name_should'"
|
||||
;;
|
||||
slackware|suse|opensuse-leap)
|
||||
# We do not read from /etc/HOSTNAME, because the running
|
||||
# hostname is the first component only while the file contains
|
||||
# the FQDN.
|
||||
suse)
|
||||
echo "hostname '$name_should'"
|
||||
;;
|
||||
*)
|
||||
# Fall back to set the hostname using hostnamectl, if available.
|
||||
if test -n "$has_hostnamectl"
|
||||
then
|
||||
# Don't use hostnamectl as the primary means to set the hostname for
|
||||
# systemd systems, because it cannot be trusted to work reliably and
|
||||
# exit with non-zero when it fails (e.g. hostname too long,
|
||||
# D-Bus failure, etc.).
|
||||
|
||||
echo "hostnamectl set-hostname \"\$(cat /etc/hostname)\""
|
||||
echo "test \"\$(hostname)\" = \"\$(cat /etc/hostname)\"" \
|
||||
" || hostname -F /etc/hostname"
|
||||
else
|
||||
printf "echo 'Unsupported OS: %s' >&2\nexit 1\n" "$os"
|
||||
fi
|
||||
printf "printf '%%s\\\\n' '$name_should' > /etc/HOSTNAME\\n"
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ "$has_hostnamectl" ]; then
|
||||
# Allow hostnamectl set-hostname to fail silently.
|
||||
# Who the fuck invented a tool that needs dbus to set the hostname anyway ...
|
||||
echo "hostnamectl set-hostname '$name_should' || true"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -8,10 +8,7 @@ cdist-type__hostname - Set the hostname
|
|||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
Sets the hostname on various operating systems.
|
||||
|
||||
**Tip:** For advice on choosing a hostname, see
|
||||
`RFC 1178 <https://tools.ietf.org/html/rfc1178>`_.
|
||||
Set's the hostname on various operating systems.
|
||||
|
||||
|
||||
REQUIRED PARAMETERS
|
||||
|
|
@ -21,7 +18,7 @@ None.
|
|||
OPTIONAL PARAMETERS
|
||||
-------------------
|
||||
name
|
||||
The hostname to set. Defaults to the first segment of __target_host
|
||||
The hostname to set. Defaults to the first segment of __target_host
|
||||
(${__target_host%%.*})
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
#
|
||||
# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
|
||||
# 2014 Nico Schottelius (nico-cdist at schottelius.org)
|
||||
# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
|
||||
#
|
||||
# This file is part of cdist.
|
||||
#
|
||||
|
|
@ -20,170 +19,50 @@
|
|||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
not_supported() {
|
||||
echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2
|
||||
echo "Please contribute an implementation for it if you can." >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
set_hostname_systemd() {
|
||||
echo "$1" | __file /etc/hostname --source -
|
||||
}
|
||||
|
||||
os=$(cat "$__global/explorer/os")
|
||||
os_version=$(cat "$__global/explorer/os_version")
|
||||
os_major=$(echo "$os_version" | grep -o '^[0-9][0-9]*')
|
||||
|
||||
max_len=$(cat "$__object/explorer/max_len")
|
||||
has_hostnamectl=$(cat "$__object/explorer/has_hostnamectl")
|
||||
|
||||
if test -s "$__object/parameter/name"
|
||||
then
|
||||
name_should=$(cat "$__object/parameter/name")
|
||||
if [ -f "$__object/parameter/name" ]; then
|
||||
name_should="$(cat "$__object/parameter/name")"
|
||||
else
|
||||
case $os
|
||||
in
|
||||
# RedHat-derivatives and BSDs
|
||||
centos|fedora|redhat|scientific|freebsd|netbsd|openbsd|slackware)
|
||||
# Hostname is FQDN
|
||||
name_should="${__target_host}"
|
||||
;;
|
||||
suse|opensuse-leap)
|
||||
# Classic SuSE stores the FQDN in /etc/HOSTNAME, while
|
||||
# systemd does not. The running hostname is the first
|
||||
# component in both cases.
|
||||
# In versions before 15.x, the FQDN is stored in /etc/hostname.
|
||||
if test -n "$has_hostnamectl" && test "$os_major" -ge 15 \
|
||||
&& test "$os_major" -ne 42
|
||||
then
|
||||
name_should="${__target_host%%.*}"
|
||||
else
|
||||
name_should="${__target_host}"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
# Hostname is only first component of FQDN on all other systems.
|
||||
name_should="${__target_host%%.*}"
|
||||
;;
|
||||
case "$os" in
|
||||
openbsd)
|
||||
name_should="${__target_host}"
|
||||
;;
|
||||
*)
|
||||
name_should="${__target_host%%.*}"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test -n "$max_len" && test "$(printf '%s' "$name_should" | wc -c)" -gt "$max_len"
|
||||
then
|
||||
printf "Host name too long. Up to %u characters allowed.\n" "${max_len}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case $os
|
||||
in
|
||||
alpine|debian|devuan|ubuntu|void)
|
||||
echo "$name_should" | __file /etc/hostname --source -
|
||||
;;
|
||||
archlinux)
|
||||
if test -n "$has_hostnamectl"
|
||||
then
|
||||
set_hostname_systemd "$name_should"
|
||||
else
|
||||
echo 'Ancient ArchLinux variants without hostnamectl are not supported.' >&2
|
||||
exit 1
|
||||
# Only for ancient ArchLinux, write to /etc/rc.conf on pre-systemd
|
||||
# versions. There are some versions which use /etc/hostname but not
|
||||
# systemd. It is unclear which ones these are.
|
||||
not_supported() {
|
||||
echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2
|
||||
echo "Please contribute an implementation for it if you can." >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
# __key_value '/etc/rc.conf:HOSTNAME' \
|
||||
# --file /etc/rc.conf \
|
||||
# --delimiter '=' --exact_delimiter \
|
||||
# --key 'HOSTNAME' \
|
||||
# --value "\"$name_should\""
|
||||
fi
|
||||
;;
|
||||
centos|fedora|redhat|scientific)
|
||||
if test -z "$has_hostnamectl"
|
||||
then
|
||||
# Only write to /etc/sysconfig/network on non-systemd versions.
|
||||
# On systemd-based versions this entry is ignored.
|
||||
__key_value '/etc/sysconfig/network:HOSTNAME' \
|
||||
--file /etc/sysconfig/network \
|
||||
--delimiter '=' --exact_delimiter \
|
||||
--key HOSTNAME \
|
||||
--value "\"$name_should\""
|
||||
else
|
||||
set_hostname_systemd "$name_should"
|
||||
fi
|
||||
;;
|
||||
gentoo)
|
||||
# Only write to /etc/conf.d/hostname on OpenRC-based installations.
|
||||
# On systemd use hostnamectl(1) in gencode-remote.
|
||||
if test -z "$has_hostnamectl"
|
||||
then
|
||||
__key_value '/etc/conf.d/hostname:hostname' \
|
||||
--file /etc/conf.d/hostname \
|
||||
--delimiter '=' --exact_delimiter \
|
||||
--key 'hostname' \
|
||||
--value "\"$name_should\""
|
||||
else
|
||||
set_hostname_systemd "$name_should"
|
||||
fi
|
||||
;;
|
||||
freebsd)
|
||||
__key_value '/etc/rc.conf:hostname' \
|
||||
--file /etc/rc.conf \
|
||||
--delimiter '=' --exact_delimiter \
|
||||
--key 'hostname' \
|
||||
--value "\"$name_should\""
|
||||
;;
|
||||
macosx)
|
||||
case "$os" in
|
||||
archlinux|debian|suse|ubuntu|devuan|coreos|alpine)
|
||||
# handled in gencode-remote
|
||||
:
|
||||
;;
|
||||
netbsd)
|
||||
__key_value '/etc/rc.conf:hostname' \
|
||||
scientific|centos)
|
||||
__key_value sysconfig-hostname \
|
||||
--file /etc/sysconfig/network \
|
||||
--delimiter '=' \
|
||||
--key HOSTNAME \
|
||||
--value "$name_should" --exact_delimiter
|
||||
;;
|
||||
freebsd)
|
||||
__key_value rcconf-hostname \
|
||||
--file /etc/rc.conf \
|
||||
--delimiter '=' --exact_delimiter \
|
||||
--delimiter '=' \
|
||||
--key 'hostname' \
|
||||
--value "\"$name_should\""
|
||||
|
||||
# To avoid confusion, ensure that the hostname is only stored once.
|
||||
__file /etc/myname --state absent
|
||||
--value "$name_should"
|
||||
;;
|
||||
openbsd)
|
||||
echo "$name_should" | __file /etc/myname --source -
|
||||
;;
|
||||
slackware)
|
||||
# We write the FQDN into /etc/HOSTNAME. But /etc/rc.d/rc.M will only
|
||||
# read the first component from this file and set it as the running
|
||||
# hostname on boot.
|
||||
echo "$name_should" | __file /etc/HOSTNAME --source -
|
||||
;;
|
||||
solaris)
|
||||
echo "$name_should" | __file /etc/nodename --source -
|
||||
;;
|
||||
suse|opensuse-leap)
|
||||
# Modern SuSE provides /etc/HOSTNAME as a symlink for
|
||||
# backwards-compatibility. Unfortunately it cannot be used
|
||||
# here as __file does not follow the symlink.
|
||||
# Therefore, we use the presence of the hostnamectl binary as
|
||||
# an indication of which file to use. This unfortunately does
|
||||
# not work correctly on openSUSE 12.x which provides
|
||||
# hostnamectl but not /etc/hostname.
|
||||
|
||||
if test -n "$has_hostnamectl" -a "$os_major" -gt 12
|
||||
then
|
||||
hostname_file='/etc/hostname'
|
||||
else
|
||||
hostname_file='/etc/HOSTNAME'
|
||||
fi
|
||||
|
||||
echo "$name_should" | __file "$hostname_file" --source -
|
||||
;;
|
||||
*)
|
||||
# On other operating systems we fall back to systemd's
|
||||
# hostnamectl if available…
|
||||
if test -n "$has_hostnamectl"
|
||||
then
|
||||
set_hostname_systemd "$name_should"
|
||||
else
|
||||
not_supported
|
||||
fi
|
||||
not_supported
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -7,12 +7,6 @@ if [ -z "${certbot_fullpath}" ]; then
|
|||
os_version="$(cat "${__global}/explorer/os_version")"
|
||||
|
||||
case "$os" in
|
||||
archlinux)
|
||||
__package certbot
|
||||
;;
|
||||
alpine)
|
||||
__package certbot
|
||||
;;
|
||||
debian)
|
||||
case "$os_version" in
|
||||
8*)
|
||||
|
|
@ -42,7 +36,6 @@ if [ -z "${certbot_fullpath}" ]; then
|
|||
10*)
|
||||
__package_apt certbot
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "Unsupported OS version: $os_version" >&2
|
||||
exit 1
|
||||
|
|
|
|||
|
|
@ -34,9 +34,6 @@ case "$type" in
|
|||
echo 0
|
||||
fi
|
||||
;;
|
||||
alpine)
|
||||
echo 0
|
||||
;;
|
||||
*) echo "Your specified type ($type) is currently not supported." >&2
|
||||
echo "Please contribute an implementation for it if you can." >&2
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ else
|
|||
amazon|scientific|centos|fedora|redhat) echo "yum" ;;
|
||||
debian|ubuntu|devuan) echo "apt" ;;
|
||||
archlinux) echo "pacman" ;;
|
||||
alpine) echo "apk" ;;
|
||||
*)
|
||||
echo "Don't know how to manage packages on: $os" >&2
|
||||
exit 1
|
||||
|
|
|
|||
|
|
@ -47,10 +47,6 @@ case "$type" in
|
|||
echo "pacman --noprogressbar --sync --refresh"
|
||||
echo "pacman package database synced (age was: $currage)" >> "$__messages_out"
|
||||
;;
|
||||
alpine)
|
||||
echo "apk update"
|
||||
echo "apk package database updated."
|
||||
;;
|
||||
*)
|
||||
echo "Don't know how to manage packages for type: $type" >&2
|
||||
exit 1
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ if [ -f "$__object/parameter/install-from-backports" ]; then
|
|||
*)
|
||||
echo "--install-from-backports is only supported on Devuan -- ignoring." >&2
|
||||
echo "Send a pull request if you require it." >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
else
|
||||
|
|
@ -61,5 +60,5 @@ require="$require __directory/$storage_path $require_pkg" \
|
|||
__config_file $CONF \
|
||||
--source "$config" \
|
||||
--group prometheus --mode 640 \
|
||||
--onchange "service prometheus-alertmanager restart" # TODO when a config-check tool is available, check config here
|
||||
--onchange "service prometheus-alertmanager reload" # TODO when a config-check tool is available, check config here
|
||||
|
||||
|
|
|
|||
|
|
@ -5,11 +5,9 @@ export GOBIN=/opt/gocode/bin # where to find go binaries
|
|||
exporter="$(cat "$__object/parameter/exporter")"
|
||||
[ -z "$exporter" ] && exporter="$__object_id"
|
||||
|
||||
__user prometheus
|
||||
require="__user/prometheus" __group prometheus
|
||||
require="__group/prometheus" __user_groups prometheus --group prometheus
|
||||
__user prometheus --system
|
||||
|
||||
require="__user_groups/prometheus"
|
||||
require=""
|
||||
case $exporter in
|
||||
node)
|
||||
TEXTFILES=/service/node-exporter/textfiles # path for the textfiles collector
|
||||
|
|
|
|||
|
|
@ -38,8 +38,7 @@ if [ -f "$__object/parameter/install-from-backports" ]; then
|
|||
esac
|
||||
else
|
||||
__package prometheus
|
||||
__package prometheus-blackbox-exporter
|
||||
require_pkg="__package/prometheus __package/prometheus-blackbox-exporter"
|
||||
require_pkg="__package/prometheus"
|
||||
fi
|
||||
|
||||
##### PREPARE PATHS AND SUCH ################################################
|
||||
|
|
@ -60,7 +59,7 @@ require="$require __directory/$storage_path $require_pkg" \
|
|||
__config_file $CONF \
|
||||
--source "$config" \
|
||||
--group prometheus --mode 640 \
|
||||
--onchange "promtool check config $CONF && service prometheus restart"
|
||||
--onchange "promtool check config $CONF && service prometheus reload"
|
||||
|
||||
for file in $rule_files; do
|
||||
dest=$CONF_DIR/$(basename "$file")
|
||||
|
|
@ -68,6 +67,6 @@ for file in $rule_files; do
|
|||
__config_file "$dest" \
|
||||
--source "$file" \
|
||||
--owner prometheus \
|
||||
--onchange "promtool check rules '$dest' && service prometheus restart"
|
||||
--onchange "promtool check rules '$dest' && service prometheus reload"
|
||||
done
|
||||
|
||||
|
|
|
|||
|
|
@ -1,131 +0,0 @@
|
|||
#!/bin/sh -e
|
||||
#
|
||||
# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
|
||||
#
|
||||
# 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/>.
|
||||
#
|
||||
#
|
||||
# Check if the given editor is present on the target system and determine its
|
||||
# absolute path.
|
||||
#
|
||||
|
||||
die() {
|
||||
echo "$@" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
editor_missing() { die "Editor '$1' is missing on the target system."; }
|
||||
editor_no_alternative() {
|
||||
die "Editor '$1' is not in the alternatives list of the target system." \
|
||||
"$(test -n "${editors}" && printf '\nPlease choose one of:\n\n%s\n' "${editors}")"
|
||||
}
|
||||
|
||||
# No need to check for the path if the file is supposed to be removed.
|
||||
test "$(cat "${__object}/parameter/state")" != 'absent' || exit 0
|
||||
|
||||
|
||||
case $("${__explorer}/os")
|
||||
in
|
||||
debian|devuan|ubuntu)
|
||||
has_alternatives=true
|
||||
|
||||
# NOTE: Old versions do not support `--list`, in this case ignore the errors.
|
||||
# This will require an absolute path to be provided, though.
|
||||
editors=$(update-alternatives --list editor 2>/dev/null)
|
||||
;;
|
||||
*)
|
||||
# NOTE: RedHat has an alternatives system but it doesn't usually track
|
||||
# editors and it is a pain to extract the list.
|
||||
has_alternatives=false
|
||||
;;
|
||||
esac
|
||||
|
||||
# Read --editor parameter and check its value since it is "optional"
|
||||
editor=$(cat "${__object}/parameter/editor" 2>/dev/null) || true
|
||||
test -n "${editor}" || die 'Please provide an --editor to configure.'
|
||||
|
||||
case $editor
|
||||
in
|
||||
/*)
|
||||
is_abspath=true
|
||||
;;
|
||||
*/*)
|
||||
die 'Relative editor paths are not supported'
|
||||
;;
|
||||
*)
|
||||
is_abspath=false
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
if $has_alternatives && test -n "${editors}"
|
||||
then
|
||||
IFS='
|
||||
'
|
||||
if ! $is_abspath
|
||||
then
|
||||
# First, try to resolve the absolute path using $editors.
|
||||
while true
|
||||
do
|
||||
for e in $editors
|
||||
do
|
||||
if test "$(basename "${e}")" = "${editor}"
|
||||
then
|
||||
editor="${e}"
|
||||
break 2 # break out of both loops
|
||||
fi
|
||||
done
|
||||
|
||||
# Iterating through alternatives did not yield a result
|
||||
editor_no_alternative "${editor}"
|
||||
break
|
||||
done
|
||||
fi
|
||||
|
||||
# Check if editor is present
|
||||
test -f "${editor}" || editor_missing "${editor}"
|
||||
|
||||
for e in $editors
|
||||
do
|
||||
if test "${editor}" = "${e}"
|
||||
then
|
||||
# Editor is part of the alternatives list -> use it!
|
||||
echo "${editor}"
|
||||
exit 0
|
||||
fi
|
||||
done
|
||||
|
||||
editor_no_alternative "${editor}"
|
||||
else
|
||||
# NOTE: This branch is mostly for RedHat-based systems which do
|
||||
# not track editor alternatives. To make this type useful
|
||||
# on RedHat at all we allow an absoloute path to be provided
|
||||
# in any case.
|
||||
|
||||
if $is_abspath
|
||||
then
|
||||
test -x "${editor}" || editor_missing "${editor}"
|
||||
|
||||
echo "${editor}"
|
||||
exit 0
|
||||
else
|
||||
die "The target doesn't list any editor alternatives. " \
|
||||
"Please specify an absolute path or populate the alternatives list."
|
||||
fi
|
||||
fi
|
||||
|
||||
# The script should never reach this statement!
|
||||
exit 1
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
cdist-type__sensible_editor(7)
|
||||
==============================
|
||||
|
||||
NAME
|
||||
----
|
||||
cdist-type__sensible_editor - Select the sensible-editor
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
This cdist type allows you to select the :strong:`sensible-editor` for
|
||||
a given user.
|
||||
|
||||
|
||||
REQUIRED PARAMETERS
|
||||
-------------------
|
||||
editor
|
||||
Name or path of the editor to be selected.
|
||||
On systems other than Debian derivatives an absolute path is required.
|
||||
|
||||
It is permissible to omit this parameter if --state is absent.
|
||||
|
||||
|
||||
OPTIONAL PARAMETERS
|
||||
-------------------
|
||||
state
|
||||
'present', 'absent', or 'exists'. Defaults to 'present', where:
|
||||
|
||||
present
|
||||
the sensible-editor is exactly what is specified in --editor.
|
||||
absent
|
||||
no sensible-editor configuration is present.
|
||||
exists
|
||||
the sensible-editor will be set to what is specified in --editor,
|
||||
unless there already is a configuration on the target system.
|
||||
|
||||
|
||||
EXAMPLES
|
||||
--------
|
||||
|
||||
.. code-block:: sh
|
||||
|
||||
__sensible_editor root --editor /bin/ed # ed(1) is the standard
|
||||
__sensible_editor noob --editor nano
|
||||
|
||||
|
||||
LIMITATIONS
|
||||
-----------
|
||||
|
||||
This type depends upon the :strong:`sensible-editor`\ (1) script which
|
||||
is part of the sensible-utils package.
|
||||
|
||||
Therefore, the following operating systems are supported:
|
||||
* Debian 8 (jessie) or later
|
||||
* Devuan
|
||||
* Ubuntu 8.10 (intrepid) or later
|
||||
* RHEL/CentOS 7 or later (EPEL repo required)
|
||||
* Fedora 21 or later
|
||||
|
||||
Note: on old versions of Ubuntu the sensible-* utils are part of the
|
||||
debianutils package.
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
:strong:`select-editor`\ (1), :strong:`sensible-editor`\ (1).
|
||||
|
||||
|
||||
AUTHOR
|
||||
-------
|
||||
Dennis Camera <dennis.camera--@--ssrq-sds-fds.ch>
|
||||
|
||||
|
||||
COPYING
|
||||
-------
|
||||
Copyright \(C) 2019 Dennis Camera.
|
||||
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.
|
||||
|
|
@ -1,94 +0,0 @@
|
|||
#!/bin/sh -e
|
||||
# -*- mode: sh; indent-tabs-mode: t -*-
|
||||
#
|
||||
# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
|
||||
#
|
||||
# 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/>.
|
||||
#
|
||||
|
||||
version_ge() {
|
||||
awk -F '[^0-9.]' -v target="${1:?}" '
|
||||
function max(x, y) { return x > y ? x : y; }
|
||||
BEGIN {
|
||||
getline;
|
||||
nx = split($1, x, ".");
|
||||
ny = split(target, y, ".");
|
||||
for (i = 1; i <= max(nx, ny); ++i) {
|
||||
diff = int(x[i]) - int(y[i]);
|
||||
if (diff < 0) exit 1;
|
||||
else if (diff > 0) exit 0;
|
||||
else continue;
|
||||
}
|
||||
}'
|
||||
}
|
||||
|
||||
not_supported() {
|
||||
echo "OS ${os} does not support __sensible_editor." >&2
|
||||
echo 'If it does, please provide a patch.' >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
os=$(cat "${__global}/explorer/os")
|
||||
os_version=$(cat "${__global}/explorer/os_version")
|
||||
|
||||
state=$(cat "${__object}/parameter/state")
|
||||
user=$__object_id
|
||||
|
||||
if test "${state}" != 'present' && test "${state}" != 'exists' && test "${state}" != 'absent'
|
||||
then
|
||||
echo 'Only "present", "exists", and "absent" are allowed for --state' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
package_name='sensible-utils'
|
||||
|
||||
case $os
|
||||
in
|
||||
debian)
|
||||
pkg_type='apt'
|
||||
;;
|
||||
devuan)
|
||||
pkg_type='apt'
|
||||
;;
|
||||
ubuntu)
|
||||
(echo "${os_version}" | version_ge 10.04) || package_name='debianutils'
|
||||
pkg_type='apt'
|
||||
;;
|
||||
centos|fedora|redhat|scientific)
|
||||
pkg_type='yum'
|
||||
;;
|
||||
*)
|
||||
not_supported
|
||||
;;
|
||||
esac
|
||||
|
||||
if test "${state}" != 'absent'
|
||||
then
|
||||
__package "${package_name}" --state present \
|
||||
--type "${pkg_type}"
|
||||
export require="__package/${package_name}"
|
||||
fi
|
||||
|
||||
editor_path=$(cat "${__object}/explorer/editor_path")
|
||||
user_home=$(cat "${__object}/explorer/user_home")
|
||||
group=$(cat "${__object}/explorer/group")
|
||||
|
||||
__file "${user_home}/.selected_editor" --state "${state}" \
|
||||
--owner "${user}" --group "${group}" --mode 0644 \
|
||||
--source - <<EOF
|
||||
# Managed by cdist
|
||||
SELECTED_EDITOR="${editor_path}"
|
||||
EOF
|
||||
|
|
@ -1 +0,0 @@
|
|||
present
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
editor
|
||||
state
|
||||
|
|
@ -23,7 +23,7 @@ state
|
|||
'present', 'absent', defaults to 'present'.
|
||||
|
||||
servers
|
||||
One or more IP addresses (space separated) of the Xymon server(s) to report
|
||||
One or more IP adresses (space separated) of the Xymon server(s) to report
|
||||
to. While DNS-names are ok it is discouraged, defaults to 127.0.0.1.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,24 +1,6 @@
|
|||
Changelog
|
||||
---------
|
||||
|
||||
6.1.0: 2019-11-19
|
||||
* Explorer hostname, type __hostname: Support more operating systems, rewrite type and hostname explorer (Dennis Camera)
|
||||
|
||||
6.0.4: 2019-11-19
|
||||
* Doc: Fix typos (Kirill Miazine)
|
||||
|
||||
6.0.3: 2019-10-31
|
||||
* Type __letsencrypt_cert: Add Alpine support (Nico Schottelius)
|
||||
* Type __xymon_client: Fix spelling error in manpage (Dmitry Bogatov)
|
||||
* Build: Support pip from git (Darko Poljak, Ľubomír Kučera)
|
||||
* Type __package_update_index: Add Alpine support (Ahmed Bilal Khalid)
|
||||
|
||||
6.0.2: 2019-10-17
|
||||
* New types: __xymon_server, __xymon_apache, __xymon_config, __xymon_client (Thomas Eckert)
|
||||
* Type __letsencrypt_cert: Add Arch Linux support (Nico Schottelius)
|
||||
* New type: __sensible_editor (Dennis Camera)
|
||||
* Types __grafana_dashboard, __prometheus_alertmanager, __prometheus_exporter, __prometheus_server: Support Debian 10 (Ahmed Bilal Khalid)
|
||||
|
||||
6.0.1: 2019-10-08
|
||||
* Type __group: Support OSes without getent (Dennis Camera)
|
||||
* Type __user: Support OSes without getent (Dennis Camera)
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ for that. This type will:
|
|||
- configure nginx.
|
||||
|
||||
Our type will not create the actual python application. Its intention is only
|
||||
to configure hosting for specified user and project. It is up to the user to
|
||||
to configure hosing for specified user and project. It is up to the user to
|
||||
create his/her applications.
|
||||
|
||||
So let's start.
|
||||
|
|
@ -480,7 +480,7 @@ Creating python bottle application
|
|||
|
||||
We now need to create Bottle application. As you remember from the beginning
|
||||
of this walkthrough our type does not create the actual python application,
|
||||
its intention is only to configure hosting for specified user and project.
|
||||
its intention is only to configure hosing for specified user and project.
|
||||
It is up to the user to create his/her applications.
|
||||
|
||||
Become app user::
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ To upgrade cdist in the current branch use
|
|||
git pull
|
||||
|
||||
# Also update the manpages
|
||||
make man
|
||||
./build man
|
||||
export MANPATH=$MANPATH:$(pwd -P)/doc/man
|
||||
|
||||
If you stay on a version branche (i.e. 1.0, 1.1., ...), nothing should break.
|
||||
|
|
|
|||
|
|
@ -1,79 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
num=50000
|
||||
dsthost=localhost
|
||||
|
||||
tmp=$(mktemp -d)
|
||||
remote_tmp=${tmp}-remote
|
||||
|
||||
cd "$tmp"
|
||||
|
||||
create_files() {
|
||||
i=0
|
||||
while [ $i -lt $num ]; do
|
||||
echo $i > file-${i}
|
||||
i=$((i+1))
|
||||
done
|
||||
}
|
||||
|
||||
delete_remote() {
|
||||
ssh "${dsthost}" "rm -rf ${remote_tmp}"
|
||||
}
|
||||
|
||||
|
||||
tar_remote() {
|
||||
cd "${tmp}"
|
||||
tar c . | ssh "${dsthost}" "mkdir ${remote_tmp}; cd ${remote_tmp}; tar x"
|
||||
}
|
||||
|
||||
cdist_remote()
|
||||
{
|
||||
(
|
||||
while [ $i -lt $num ]; do
|
||||
echo __file ${remote_tmp}/file-${i} --source "${tmp}/file-${i}"
|
||||
i=$((i+1))
|
||||
done
|
||||
) | cdist config -i - -vv "${dsthost}"
|
||||
|
||||
}
|
||||
|
||||
cdist_remote_parallel()
|
||||
{
|
||||
(
|
||||
while [ $i -lt $num ]; do
|
||||
echo __file ${remote_tmp}/file-${i} --source "${tmp}/file-${i}"
|
||||
i=$((i+1))
|
||||
done
|
||||
) | cdist config -j10 -i - -vv "${dsthost}"
|
||||
|
||||
}
|
||||
|
||||
echo "Creating ${num} files"
|
||||
time create_files
|
||||
|
||||
echo "scping files"
|
||||
time scp -r "${tmp}" "${dsthost}:$remote_tmp" >/dev/null
|
||||
|
||||
echo "delete remote"
|
||||
time delete_remote
|
||||
|
||||
echo "taring files"
|
||||
time tar_remote
|
||||
|
||||
echo "delete remote"
|
||||
time delete_remote
|
||||
|
||||
echo "cdisting files"
|
||||
time cdist_remote
|
||||
|
||||
echo "delete remote"
|
||||
time delete_remote
|
||||
|
||||
echo "cdisting files (parallel)!"
|
||||
time cdist_remote
|
||||
|
||||
echo "delete remote"
|
||||
time delete_remote
|
||||
|
||||
echo "delete local"
|
||||
rm -rf "$tmp"
|
||||
22
setup.py
22
setup.py
|
|
@ -1,27 +1,7 @@
|
|||
from distutils.core import setup
|
||||
from distutils.errors import DistutilsError
|
||||
import cdist
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
|
||||
|
||||
# We have it only if it is a git cloned repo.
|
||||
build_helper = os.path.join('bin', 'build-helper')
|
||||
# Version file path.
|
||||
version_file = os.path.join('cdist', 'version.py')
|
||||
# If we have build-helper we could be a git repo.
|
||||
if os.path.exists(build_helper):
|
||||
# Try to generate version.py.
|
||||
rv = subprocess.run([build_helper, 'version', ])
|
||||
if rv.returncode != 0:
|
||||
raise DistutilsError("Failed to generate {}".format(version_file))
|
||||
else:
|
||||
# Otherwise, version.py should be present.
|
||||
if not os.path.exists(version_file):
|
||||
raise DistutilsError("Missing version file {}".format(version_file))
|
||||
|
||||
|
||||
import cdist
|
||||
|
||||
|
||||
def data_finder(data_dir):
|
||||
|
|
|
|||
Loading…
Reference in a new issue