Compare commits
No commits in common. "master" and "bugfix/in-script-import" have entirely different histories.
master
...
bugfix/in-
53 changed files with 168 additions and 1909 deletions
cdist
conf
explorer
type
__apt_backports
__block
__dot_file
__hostname
__ipset
__iptables_apply
__iptables_rule
__locale
__localedef
__package_pkgng_freebsd
__sshd_config
test
docs
setup.py|
|
@ -70,11 +70,6 @@ case "$("$__explorer/os")" in
|
||||||
macosx)
|
macosx)
|
||||||
sw_vers -productVersion
|
sw_vers -productVersion
|
||||||
;;
|
;;
|
||||||
freebsd)
|
|
||||||
# Apparently uname -r is not a reliable way to get the patch level.
|
|
||||||
# See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=251743
|
|
||||||
freebsd-version
|
|
||||||
;;
|
|
||||||
*bsd|solaris)
|
*bsd|solaris)
|
||||||
uname -r
|
uname -r
|
||||||
;;
|
;;
|
||||||
|
|
|
||||||
|
|
@ -1,104 +0,0 @@
|
||||||
cdist-type__debian_backports(7)
|
|
||||||
===============================
|
|
||||||
|
|
||||||
NAME
|
|
||||||
----
|
|
||||||
cdist-type__apt_backports - Install backports
|
|
||||||
|
|
||||||
|
|
||||||
DESCRIPTION
|
|
||||||
-----------
|
|
||||||
This singleton type installs backports for the current OS release.
|
|
||||||
It aborts if backports are not supported for the specified OS or
|
|
||||||
no version codename could be fetched (like Debian unstable).
|
|
||||||
|
|
||||||
The package index will be automatically updated if required.
|
|
||||||
|
|
||||||
It supports backports from following OSes:
|
|
||||||
|
|
||||||
- Debian
|
|
||||||
- Devuan
|
|
||||||
- Ubuntu
|
|
||||||
|
|
||||||
|
|
||||||
REQUIRED PARAMETERS
|
|
||||||
-------------------
|
|
||||||
None.
|
|
||||||
|
|
||||||
|
|
||||||
OPTIONAL PARAMETERS
|
|
||||||
-------------------
|
|
||||||
state
|
|
||||||
Represents the state of the backports repository. ``present`` or
|
|
||||||
``absent``, defaults to ``present``.
|
|
||||||
|
|
||||||
Will be directly passed to :strong:`cdist-type__apt_source`\ (7).
|
|
||||||
|
|
||||||
mirror
|
|
||||||
The mirror to fetch the backports from. Will defaults to the generic
|
|
||||||
mirror of the current OS.
|
|
||||||
|
|
||||||
Will be directly passed to :strong:`cdist-type__apt_source`\ (7).
|
|
||||||
|
|
||||||
|
|
||||||
BOOLEAN PARAMETERS
|
|
||||||
------------------
|
|
||||||
None.
|
|
||||||
|
|
||||||
|
|
||||||
MESSAGES
|
|
||||||
--------
|
|
||||||
None.
|
|
||||||
|
|
||||||
|
|
||||||
EXAMPLES
|
|
||||||
--------
|
|
||||||
|
|
||||||
.. code-block:: sh
|
|
||||||
|
|
||||||
# setup the backports
|
|
||||||
__apt_backports
|
|
||||||
__apt_backports --state absent
|
|
||||||
__apt_backports --state present --mirror "http://ftp.de.debian.org/debian/"
|
|
||||||
|
|
||||||
# install a backports package
|
|
||||||
# currently for the buster release backports
|
|
||||||
require="__apt_backports" __package_apt wireguard \
|
|
||||||
--target-release buster-backports
|
|
||||||
|
|
||||||
|
|
||||||
ABORTS
|
|
||||||
------
|
|
||||||
Aborts if the detected os is not Debian.
|
|
||||||
|
|
||||||
Aborts if no distribuition codename could be detected. This is common for the
|
|
||||||
unstable distribution, but there is no backports repository for it already.
|
|
||||||
|
|
||||||
|
|
||||||
CAVEATS
|
|
||||||
-------
|
|
||||||
For Ubuntu, it setup all componenents for the backports repository: ``main``,
|
|
||||||
``restricted``, ``universe`` and ``multiverse``. The user may not want to
|
|
||||||
install proprietary packages, which will only be installed if the user
|
|
||||||
explicitly uses the backports target-release. The user may change this behavior
|
|
||||||
to install backports packages without the need of explicitly select it.
|
|
||||||
|
|
||||||
|
|
||||||
SEE ALSO
|
|
||||||
--------
|
|
||||||
`Official Debian Backports site <https://backports.debian.org/>`_
|
|
||||||
|
|
||||||
:strong:`cdist-type__apt_source`\ (7)
|
|
||||||
|
|
||||||
|
|
||||||
AUTHORS
|
|
||||||
-------
|
|
||||||
Matthias Stecher <matthiasstecher at gmx.de>
|
|
||||||
|
|
||||||
|
|
||||||
COPYING
|
|
||||||
-------
|
|
||||||
Copyright \(C) 2020 Matthias Stecher. 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,81 +0,0 @@
|
||||||
#!/bin/sh -e
|
|
||||||
# __apt_backports/manifest
|
|
||||||
#
|
|
||||||
# 2020 Matthias Stecher (matthiasstecher at gmx.de)
|
|
||||||
#
|
|
||||||
# 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/>.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# Enables/disables backports repository. Utilises __apt_source for it.
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
# Get the distribution codename by /etc/os-release.
|
|
||||||
# is already executed in a subshell by string substitution
|
|
||||||
# lsb_release may not be given in all installations
|
|
||||||
codename_os_release() {
|
|
||||||
# shellcheck disable=SC1090
|
|
||||||
. "$__global/explorer/os_release"
|
|
||||||
printf "%s" "$VERSION_CODENAME"
|
|
||||||
}
|
|
||||||
|
|
||||||
# detect backport distribution
|
|
||||||
os="$(cat "$__global/explorer/os")"
|
|
||||||
case "$os" in
|
|
||||||
debian)
|
|
||||||
dist="$( codename_os_release )"
|
|
||||||
components="main"
|
|
||||||
mirror="http://deb.debian.org/debian/"
|
|
||||||
;;
|
|
||||||
devuan)
|
|
||||||
dist="$( codename_os_release )"
|
|
||||||
components="main"
|
|
||||||
mirror="http://deb.devuan.org/merged"
|
|
||||||
;;
|
|
||||||
ubuntu)
|
|
||||||
dist="$( codename_os_release )"
|
|
||||||
components="main restricted universe multiverse"
|
|
||||||
mirror="http://archive.ubuntu.com/ubuntu"
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
printf "Backports for %s are not supported!\n" "$os" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# error if no codename given (e.g. on Debian unstable)
|
|
||||||
if [ -z "$dist" ]; then
|
|
||||||
printf "No backports for unkown version of distribution %s!\n" "$os" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# parameters
|
|
||||||
state="$(cat "$__object/parameter/state")"
|
|
||||||
|
|
||||||
# mirror already set for the os, only override user-values
|
|
||||||
if [ -f "$__object/parameter/mirror" ]; then
|
|
||||||
mirror="$(cat "$__object/parameter/mirror")"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# install the given backports repository
|
|
||||||
__apt_source "${dist}-backports" \
|
|
||||||
--state "$state" \
|
|
||||||
--distribution "${dist}-backports" \
|
|
||||||
--component "$components" \
|
|
||||||
--uri "$mirror"
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
present
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
state
|
|
||||||
mirror
|
|
||||||
|
|
@ -46,29 +46,28 @@ fi
|
||||||
|
|
||||||
remove_block() {
|
remove_block() {
|
||||||
cat << DONE
|
cat << DONE
|
||||||
tmpfile=\$(mktemp ${quoted_file}.cdist.XXXXXXXXXX)
|
tmpfile=\$(mktemp ${file}.cdist.XXXXXXXXXX)
|
||||||
# preserve ownership and permissions of existing file
|
# preserve ownership and permissions of existing file
|
||||||
if [ -f $quoted_file ]; then
|
if [ -f "$file" ]; then
|
||||||
cp -p $quoted_file "\$tmpfile"
|
cp -p "$file" "\$tmpfile"
|
||||||
fi
|
fi
|
||||||
awk -v prefix=$(quote "$prefix") -v suffix=$(quote "$suffix") '
|
awk -v prefix=^$(quote "$prefix")\$ -v suffix=^$(quote "$suffix")\$ '
|
||||||
{
|
{
|
||||||
if (\$0 == prefix) {
|
if (match(\$0,prefix)) {
|
||||||
triggered=1
|
triggered=1
|
||||||
}
|
}
|
||||||
if (triggered) {
|
if (triggered) {
|
||||||
if (\$0 == suffix) {
|
if (match(\$0,suffix)) {
|
||||||
triggered=0
|
triggered=0
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
print
|
print
|
||||||
}
|
}
|
||||||
}' $quoted_file > "\$tmpfile"
|
}' "$file" > "\$tmpfile"
|
||||||
mv -f "\$tmpfile" $quoted_file
|
mv -f "\$tmpfile" "$file"
|
||||||
DONE
|
DONE
|
||||||
}
|
}
|
||||||
|
|
||||||
quoted_file="$(quote "$file")"
|
|
||||||
case "$state_should" in
|
case "$state_should" in
|
||||||
present)
|
present)
|
||||||
if [ "$state_is" = "changed" ]; then
|
if [ "$state_is" = "changed" ]; then
|
||||||
|
|
@ -78,7 +77,7 @@ case "$state_should" in
|
||||||
echo add >> "$__messages_out"
|
echo add >> "$__messages_out"
|
||||||
fi
|
fi
|
||||||
cat << DONE
|
cat << DONE
|
||||||
cat >> $quoted_file << '${__type##*/}_DONE'
|
cat >> "$file" << ${__type##*/}_DONE
|
||||||
$(cat "$block")
|
$(cat "$block")
|
||||||
${__type##*/}_DONE
|
${__type##*/}_DONE
|
||||||
DONE
|
DONE
|
||||||
|
|
|
||||||
|
|
@ -25,9 +25,6 @@ user
|
||||||
OPTIONAL PARAMETERS
|
OPTIONAL PARAMETERS
|
||||||
-------------------
|
-------------------
|
||||||
|
|
||||||
dirmode
|
|
||||||
forwarded to :strong:`__directory` type as mode
|
|
||||||
|
|
||||||
mode
|
mode
|
||||||
forwarded to :strong:`__file` type
|
forwarded to :strong:`__file` type
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,6 @@ set -eu
|
||||||
user="$(cat "${__object}/parameter/user")"
|
user="$(cat "${__object}/parameter/user")"
|
||||||
home="$(cat "${__object}/explorer/home")"
|
home="$(cat "${__object}/explorer/home")"
|
||||||
primary_group="$(cat "${__object}/explorer/primary_group")"
|
primary_group="$(cat "${__object}/explorer/primary_group")"
|
||||||
dirmode="$(cat "${__object}/parameter/dirmode")"
|
|
||||||
|
|
||||||
# Create parent directory. Type __directory has flag 'parents', but it
|
# Create parent directory. Type __directory has flag 'parents', but it
|
||||||
# will leave us with root-owned directory in user home, which is not
|
# will leave us with root-owned directory in user home, which is not
|
||||||
|
|
@ -37,7 +36,6 @@ export CDIST_ORDER_DEPENDENCY
|
||||||
for dir ; do
|
for dir ; do
|
||||||
__directory "${home}/${dir}" \
|
__directory "${home}/${dir}" \
|
||||||
--group "${primary_group}" \
|
--group "${primary_group}" \
|
||||||
--mode "${dirmode}" \
|
|
||||||
--owner "${user}"
|
--owner "${user}"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0700
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
state
|
state
|
||||||
mode
|
mode
|
||||||
source
|
source
|
||||||
dirmode
|
|
||||||
|
|
|
||||||
|
|
@ -20,27 +20,26 @@
|
||||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
|
||||||
os=$(cat "${__global:?}/explorer/os")
|
os=$(cat "$__global/explorer/os")
|
||||||
name_running=$(cat "${__global:?}/explorer/hostname")
|
name_running=$(cat "$__global/explorer/hostname")
|
||||||
has_hostnamectl=$(cat "${__object:?}/explorer/has_hostnamectl")
|
has_hostnamectl=$(cat "$__object/explorer/has_hostnamectl")
|
||||||
|
|
||||||
|
|
||||||
if test -s "${__object:?}/parameter/name"
|
if test -s "$__object/parameter/name"
|
||||||
then
|
then
|
||||||
name_should=$(cat "${__object:?}/parameter/name")
|
name_should=$(cat "$__object/parameter/name")
|
||||||
else
|
else
|
||||||
case ${os}
|
case $os
|
||||||
in
|
in
|
||||||
# RedHat-derivatives and BSDs
|
# RedHat-derivatives and BSDs
|
||||||
(centos|fedora|redhat|scientific|freebsd|macosx|netbsd|openbsd)
|
centos|fedora|redhat|scientific|freebsd|macosx|netbsd|openbsd)
|
||||||
# Hostname is FQDN
|
# Hostname is FQDN
|
||||||
name_should=${__target_host:?}
|
name_should="${__target_host}"
|
||||||
;;
|
;;
|
||||||
(*)
|
*)
|
||||||
# Hostname is only first component of FQDN
|
# Hostname is only first component of FQDN
|
||||||
name_should=${__target_host:?}
|
name_should="${__target_host%%.*}"
|
||||||
name_should=${name_should%%.*}
|
;;
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -48,46 +47,46 @@ fi
|
||||||
################################################################################
|
################################################################################
|
||||||
# Check if the (running) hostname is already correct
|
# Check if the (running) hostname is already correct
|
||||||
#
|
#
|
||||||
test "${name_running}" != "${name_should}" || exit 0
|
test "$name_running" != "$name_should" || exit 0
|
||||||
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Setup hostname
|
# Setup hostname
|
||||||
#
|
#
|
||||||
echo 'changed' >>"${__messages_out:?}"
|
echo 'changed' >>"$__messages_out"
|
||||||
|
|
||||||
# Use the good old way to set the hostname.
|
# Use the good old way to set the hostname.
|
||||||
case ${os}
|
case $os
|
||||||
in
|
in
|
||||||
(alpine|debian|devuan|ubuntu)
|
alpine|debian|devuan|ubuntu)
|
||||||
echo 'hostname -F /etc/hostname'
|
echo 'hostname -F /etc/hostname'
|
||||||
;;
|
;;
|
||||||
(archlinux)
|
archlinux)
|
||||||
echo 'command -v hostnamectl >/dev/null 2>&1' \
|
echo 'command -v hostnamectl >/dev/null 2>&1' \
|
||||||
"&& hostnamectl set-hostname '${name_should}'" \
|
"&& hostnamectl set-hostname '$name_should'" \
|
||||||
"|| hostname '${name_should}'"
|
"|| hostname '$name_should'"
|
||||||
;;
|
;;
|
||||||
(centos|fedora|redhat|scientific|freebsd|netbsd|openbsd|gentoo|void)
|
centos|fedora|redhat|scientific|freebsd|netbsd|openbsd|gentoo|void)
|
||||||
echo "hostname '${name_should}'"
|
echo "hostname '$name_should'"
|
||||||
;;
|
;;
|
||||||
(openwrt)
|
openwrt)
|
||||||
echo "echo '${name_should}' >/proc/sys/kernel/hostname"
|
echo "echo '$name_should' >/proc/sys/kernel/hostname"
|
||||||
;;
|
;;
|
||||||
(macosx)
|
macosx)
|
||||||
echo "scutil --set HostName '${name_should}'"
|
echo "scutil --set HostName '$name_should'"
|
||||||
;;
|
;;
|
||||||
(solaris)
|
solaris)
|
||||||
echo "uname -S '${name_should}'"
|
echo "uname -S '$name_should'"
|
||||||
;;
|
;;
|
||||||
(slackware|suse)
|
slackware|suse|opensuse-leap)
|
||||||
# We do not read from /etc/HOSTNAME, because the running
|
# We do not read from /etc/HOSTNAME, because the running
|
||||||
# hostname is the first component only while the file contains
|
# hostname is the first component only while the file contains
|
||||||
# the FQDN.
|
# the FQDN.
|
||||||
echo "hostname '${name_should}'"
|
echo "hostname '$name_should'"
|
||||||
;;
|
;;
|
||||||
(*)
|
*)
|
||||||
# Fall back to set the hostname using hostnamectl, if available.
|
# Fall back to set the hostname using hostnamectl, if available.
|
||||||
if test -n "${has_hostnamectl}"
|
if test -n "$has_hostnamectl"
|
||||||
then
|
then
|
||||||
# Don't use hostnamectl as the primary means to set the hostname for
|
# Don't use hostnamectl as the primary means to set the hostname for
|
||||||
# systemd systems, because it cannot be trusted to work reliably and
|
# systemd systems, because it cannot be trusted to work reliably and
|
||||||
|
|
@ -98,8 +97,7 @@ in
|
||||||
echo "test \"\$(hostname)\" = \"\$(cat /etc/hostname)\"" \
|
echo "test \"\$(hostname)\" = \"\$(cat /etc/hostname)\"" \
|
||||||
" || hostname -F /etc/hostname"
|
" || hostname -F /etc/hostname"
|
||||||
else
|
else
|
||||||
printf "echo 'Unsupported OS: %s' >&2\n" "${os}"
|
printf "echo 'Unsupported OS: %s' >&2\nexit 1\n" "$os"
|
||||||
printf 'exit 1\n'
|
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
||||||
|
|
@ -20,49 +20,69 @@
|
||||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
# 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() {
|
set_hostname_systemd() {
|
||||||
echo "$1" | __file /etc/hostname --source -
|
echo "$1" | __file /etc/hostname --source -
|
||||||
}
|
}
|
||||||
|
|
||||||
os=$(cat "${__global:?}/explorer/os")
|
os=$(cat "$__global/explorer/os")
|
||||||
|
os_version=$(cat "$__global/explorer/os_version")
|
||||||
|
os_major=$(echo "$os_version" | grep -o '^[0-9][0-9]*' || true)
|
||||||
|
|
||||||
max_len=$(cat "${__object:?}/explorer/max_len")
|
max_len=$(cat "$__object/explorer/max_len")
|
||||||
has_hostnamectl=$(cat "${__object:?}/explorer/has_hostnamectl")
|
has_hostnamectl=$(cat "$__object/explorer/has_hostnamectl")
|
||||||
|
|
||||||
if test -s "${__object:?}/parameter/name"
|
if test -s "$__object/parameter/name"
|
||||||
then
|
then
|
||||||
name_should=$(cat "${__object:?}/parameter/name")
|
name_should=$(cat "$__object/parameter/name")
|
||||||
else
|
else
|
||||||
case ${os}
|
case $os
|
||||||
in
|
in
|
||||||
# RedHat-derivatives and BSDs
|
# RedHat-derivatives and BSDs
|
||||||
(centos|fedora|redhat|scientific|freebsd|netbsd|openbsd|slackware|suse)
|
centos|fedora|redhat|scientific|freebsd|netbsd|openbsd|slackware)
|
||||||
# Hostname is FQDN
|
# Hostname is FQDN
|
||||||
name_should=${__target_host:?}
|
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.
|
# Hostname is only first component of FQDN on all other systems.
|
||||||
name_should=${__target_host:?}
|
name_should="${__target_host%%.*}"
|
||||||
name_should=${name_should%%.*}
|
;;
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -n "${max_len}" && test "$(printf '%s' "${name_should}" | wc -c)" -gt "${max_len}"
|
if test -n "$max_len" && test "$(printf '%s' "$name_should" | wc -c)" -gt "$max_len"
|
||||||
then
|
then
|
||||||
printf "Host name too long. Up to %u characters allowed.\n" "${max_len}" >&2
|
printf "Host name too long. Up to %u characters allowed.\n" "${max_len}" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case ${os}
|
case $os
|
||||||
in
|
in
|
||||||
(alpine|debian|devuan|ubuntu|void)
|
alpine|debian|devuan|ubuntu|void)
|
||||||
echo "${name_should}" | __file /etc/hostname --source -
|
echo "$name_should" | __file /etc/hostname --source -
|
||||||
;;
|
;;
|
||||||
(archlinux)
|
archlinux)
|
||||||
if test -n "${has_hostnamectl}"
|
if test -n "$has_hostnamectl"
|
||||||
then
|
then
|
||||||
set_hostname_systemd "${name_should}"
|
set_hostname_systemd "$name_should"
|
||||||
else
|
else
|
||||||
echo 'Ancient ArchLinux variants without hostnamectl are not supported.' >&2
|
echo 'Ancient ArchLinux variants without hostnamectl are not supported.' >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
|
@ -77,8 +97,8 @@ in
|
||||||
# --value "\"$name_should\""
|
# --value "\"$name_should\""
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
(centos|fedora|redhat|scientific)
|
centos|fedora|redhat|scientific)
|
||||||
if test -z "${has_hostnamectl}"
|
if test -z "$has_hostnamectl"
|
||||||
then
|
then
|
||||||
# Only write to /etc/sysconfig/network on non-systemd versions.
|
# Only write to /etc/sysconfig/network on non-systemd versions.
|
||||||
# On systemd-based versions this entry is ignored.
|
# On systemd-based versions this entry is ignored.
|
||||||
|
|
@ -86,83 +106,63 @@ in
|
||||||
--file /etc/sysconfig/network \
|
--file /etc/sysconfig/network \
|
||||||
--delimiter '=' --exact_delimiter \
|
--delimiter '=' --exact_delimiter \
|
||||||
--key HOSTNAME \
|
--key HOSTNAME \
|
||||||
--value "\"${name_should}\""
|
--value "\"$name_should\""
|
||||||
else
|
else
|
||||||
set_hostname_systemd "${name_should}"
|
set_hostname_systemd "$name_should"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
(gentoo)
|
gentoo)
|
||||||
# Only write to /etc/conf.d/hostname on OpenRC-based installations.
|
# Only write to /etc/conf.d/hostname on OpenRC-based installations.
|
||||||
# On systemd use hostnamectl(1) in gencode-remote.
|
# On systemd use hostnamectl(1) in gencode-remote.
|
||||||
if test -z "${has_hostnamectl}"
|
if test -z "$has_hostnamectl"
|
||||||
then
|
then
|
||||||
__key_value '/etc/conf.d/hostname:hostname' \
|
__key_value '/etc/conf.d/hostname:hostname' \
|
||||||
--file /etc/conf.d/hostname \
|
--file /etc/conf.d/hostname \
|
||||||
--delimiter '=' --exact_delimiter \
|
--delimiter '=' --exact_delimiter \
|
||||||
--key 'hostname' \
|
--key 'hostname' \
|
||||||
--value "\"${name_should}\""
|
--value "\"$name_should\""
|
||||||
else
|
else
|
||||||
set_hostname_systemd "$name_should"
|
set_hostname_systemd "$name_should"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
(freebsd)
|
freebsd)
|
||||||
__key_value '/etc/rc.conf:hostname' \
|
__key_value '/etc/rc.conf:hostname' \
|
||||||
--file /etc/rc.conf \
|
--file /etc/rc.conf \
|
||||||
--delimiter '=' --exact_delimiter \
|
--delimiter '=' --exact_delimiter \
|
||||||
--key 'hostname' \
|
--key 'hostname' \
|
||||||
--value "\"${name_should}\""
|
--value "\"$name_should\""
|
||||||
;;
|
;;
|
||||||
(macosx)
|
macosx)
|
||||||
# handled in gencode-remote
|
# handled in gencode-remote
|
||||||
;;
|
:
|
||||||
(netbsd)
|
;;
|
||||||
|
netbsd)
|
||||||
__key_value '/etc/rc.conf:hostname' \
|
__key_value '/etc/rc.conf:hostname' \
|
||||||
--file /etc/rc.conf \
|
--file /etc/rc.conf \
|
||||||
--delimiter '=' --exact_delimiter \
|
--delimiter '=' --exact_delimiter \
|
||||||
--key 'hostname' \
|
--key 'hostname' \
|
||||||
--value "\"${name_should}\""
|
--value "\"$name_should\""
|
||||||
|
|
||||||
# To avoid confusion, ensure that the hostname is only stored once.
|
# To avoid confusion, ensure that the hostname is only stored once.
|
||||||
__file /etc/myname --state absent
|
__file /etc/myname --state absent
|
||||||
;;
|
;;
|
||||||
(openbsd)
|
openbsd)
|
||||||
echo "${name_should}" | __file /etc/myname --source -
|
echo "$name_should" | __file /etc/myname --source -
|
||||||
;;
|
;;
|
||||||
(openwrt)
|
openwrt)
|
||||||
__uci system.@system[0].hostname --value "${name_should}"
|
__uci system.@system[0].hostname --value "$name_should"
|
||||||
# --transaction hostname
|
# --transaction hostname
|
||||||
;;
|
;;
|
||||||
(slackware)
|
slackware)
|
||||||
# We write the FQDN into /etc/HOSTNAME. But /etc/rc.d/rc.M will only
|
# 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
|
# read the first component from this file and set it as the running
|
||||||
# hostname on boot.
|
# hostname on boot.
|
||||||
echo "${name_should}" | __file /etc/HOSTNAME --source -
|
echo "$name_should" | __file /etc/HOSTNAME --source -
|
||||||
;;
|
;;
|
||||||
(solaris)
|
solaris)
|
||||||
echo "${name_should}" | __file /etc/nodename --source -
|
echo "$name_should" | __file /etc/nodename --source -
|
||||||
;;
|
;;
|
||||||
(suse)
|
suse|opensuse-leap)
|
||||||
if test -s "${__global:?}/explorer/os_release"
|
|
||||||
then
|
|
||||||
# shellcheck source=/dev/null
|
|
||||||
os_version=$(. "${__global:?}/explorer/os_release" && echo "${VERSION}")
|
|
||||||
else
|
|
||||||
os_version=$(sed -n 's/^VERSION\ *=\ *//p' "${__global:?}/explorer/os_version")
|
|
||||||
fi
|
|
||||||
os_major=$(expr "${os_version}" : '\([0-9]\{1,\}\)')
|
|
||||||
|
|
||||||
# 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
|
|
||||||
# strip away everything but the first part from $name_should
|
|
||||||
name_should=${name_should%%.*}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Modern SuSE provides /etc/HOSTNAME as a symlink for
|
# Modern SuSE provides /etc/HOSTNAME as a symlink for
|
||||||
# backwards-compatibility. Unfortunately it cannot be used
|
# backwards-compatibility. Unfortunately it cannot be used
|
||||||
# here as __file does not follow the symlink.
|
# here as __file does not follow the symlink.
|
||||||
|
|
@ -171,25 +171,23 @@ in
|
||||||
# not work correctly on openSUSE 12.x which provides
|
# not work correctly on openSUSE 12.x which provides
|
||||||
# hostnamectl but not /etc/hostname.
|
# hostnamectl but not /etc/hostname.
|
||||||
|
|
||||||
if test -n "${has_hostnamectl}" -a "${os_major}" -gt 12
|
if test -n "$has_hostnamectl" -a "$os_major" -gt 12
|
||||||
then
|
then
|
||||||
hostname_file=/etc/hostname
|
hostname_file='/etc/hostname'
|
||||||
else
|
else
|
||||||
hostname_file=/etc/HOSTNAME
|
hostname_file='/etc/HOSTNAME'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "${name_should}" | __file "${hostname_file}" --source -
|
echo "$name_should" | __file "$hostname_file" --source -
|
||||||
;;
|
;;
|
||||||
(*)
|
*)
|
||||||
# On other operating systems we fall back to systemd's
|
# On other operating systems we fall back to systemd's
|
||||||
# hostnamectl if available…
|
# hostnamectl if available…
|
||||||
if test -n "${has_hostnamectl}"
|
if test -n "$has_hostnamectl"
|
||||||
then
|
then
|
||||||
set_hostname_systemd "${name_should}"
|
set_hostname_systemd "$name_should"
|
||||||
else
|
else
|
||||||
echo "Your operating system (${os}) is currently not supported by this type (${__type##*/})." >&2
|
not_supported
|
||||||
echo "Please contribute an implementation for it if you can." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# 2021 Mesar Hameed (mesar.hameed 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/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
name="$__object_id"
|
|
||||||
if ipset -t list | grep -qFx "Name: $name"; then
|
|
||||||
ipset list "$name" | sed '0,/^Members:/d'
|
|
||||||
else
|
|
||||||
echo "x_missing_x"
|
|
||||||
fi
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# 2021 Mesar Hameed (mesar.hameed 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/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
name="$__object_id"
|
|
||||||
if ipset -t list "$name" >/dev/null; then
|
|
||||||
echo "present"
|
|
||||||
else
|
|
||||||
echo "absent"
|
|
||||||
fi
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# 2021 Mesar Hameed (mesar.hameed 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/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
name="$__object_id"
|
|
||||||
if ipset -t list | grep -qFx "Name: $name"; then
|
|
||||||
ipset -t list "$name" | grep "^Type: " | awk '{print $2}'
|
|
||||||
else
|
|
||||||
echo "x_missing_x"
|
|
||||||
fi
|
|
||||||
|
|
@ -1,48 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# 2021 Mesar Hameed (mesar.hameed 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/>.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
### BEGIN INIT INFO
|
|
||||||
# Provides: ipset
|
|
||||||
# Required-Start: $local_fs $remote_fs
|
|
||||||
# Required-Stop: $local_fs $remote_fs
|
|
||||||
# X-Start-Before: iptables
|
|
||||||
# Default-Start: 2 3 4 5
|
|
||||||
# Default-Stop: 0 1 6
|
|
||||||
# Short-Description: Create ipset lists before iptables rules require them
|
|
||||||
# Description: Applies lists found in /etc/ipset.d/*.saved
|
|
||||||
# and saves/restores previous status
|
|
||||||
### END INIT INFO
|
|
||||||
|
|
||||||
case $1 in
|
|
||||||
start)
|
|
||||||
# Restore previous state:
|
|
||||||
/usr/local/bin/ipsets-restore
|
|
||||||
;;
|
|
||||||
stop)
|
|
||||||
# Save current state before exiting:
|
|
||||||
/usr/local/bin/ipsets-save
|
|
||||||
;;
|
|
||||||
restart)
|
|
||||||
"$0" stop && "$0" start
|
|
||||||
;;
|
|
||||||
reset)
|
|
||||||
ipset flush
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# 2021 Mesar Hameed (mesar.hameed 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/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
mkdir -p /etc/ipset.d/
|
|
||||||
if [ -n "$1" ]; then
|
|
||||||
ipset -! restore < "/etc/ipset.d/$1"
|
|
||||||
else
|
|
||||||
find /etc/ipset.d/ -iname "*.saved" | while read s; do
|
|
||||||
ipset -! restore <$s
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# 2021 Mesar Hameed (mesar.hameed 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/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
mkdir -p /etc/ipset.d/
|
|
||||||
if [ -n "$1" ]; then
|
|
||||||
ipset save "$1" > "/etc/ipset.d/${1}.saved"
|
|
||||||
else
|
|
||||||
ipset -t list | grep "^Name:" | awk '{print $2}' | while read s; do
|
|
||||||
ipset save $s > /etc/ipset.d/$s.saved
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
@ -1,79 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# 2021 Mesar Hameed (mesar.hameed 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/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
e="$__object/explorer"
|
|
||||||
p="$__object/parameter"
|
|
||||||
name="$__object_id"
|
|
||||||
type_is="$(cat "$e/type")"
|
|
||||||
type_should="$(cat "$p/type")"
|
|
||||||
state_is="$(cat "$e/state")"
|
|
||||||
state_should="$(cat "$p/state")"
|
|
||||||
needToSave=0
|
|
||||||
|
|
||||||
case $state_should in
|
|
||||||
present)
|
|
||||||
if [ "$state_is" = "absent" ]; then
|
|
||||||
echo ipset create "$name" "$type_should"
|
|
||||||
needToSave=1
|
|
||||||
elif [ "$state_is" = "present" ] && [ "$type_is" != "$type_should" ]; then
|
|
||||||
echo ipset destroy "$name"
|
|
||||||
echo "rm \"/etc/ipset.d/${name}.saved\" || true"
|
|
||||||
echo ipset create "$name" "$type_should"
|
|
||||||
needToSave=1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
absent)
|
|
||||||
if [ "$state_is" = "present" ]; then
|
|
||||||
echo ipset destroy "$name"
|
|
||||||
echo "rm \"/etc/ipset.d/${name}.saved\" || true"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Unknown state: $state_should" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ "$state_should" = "present" ]; then
|
|
||||||
if [ -f "$p/add" ]; then
|
|
||||||
while read -r value; do
|
|
||||||
if ! grep -qFx "$value" "$e/content"; then
|
|
||||||
echo "ipset -! add $name $value"
|
|
||||||
needToSave=1
|
|
||||||
fi
|
|
||||||
done < "$p/add"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f "$p/del" ]; then
|
|
||||||
while read -r value; do
|
|
||||||
if grep -qFx "$value" "$e/content"; then
|
|
||||||
echo "ipset -! del $name $value"
|
|
||||||
needToSave=1
|
|
||||||
fi
|
|
||||||
done < "$p/del"
|
|
||||||
fi
|
|
||||||
elif [ "$state_should" = "absent" ] && \( [ -f "$p/add" ] || [ -f "$p/del" ] \); then
|
|
||||||
echo "Error: ipset state absent is incompatible with --add or --del" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ $needToSave -ne 0 ]; then
|
|
||||||
echo /usr/local/bin/ipsets-save "$name"
|
|
||||||
fi
|
|
||||||
|
|
@ -1,69 +0,0 @@
|
||||||
cdist-type__ipset(7)
|
|
||||||
====================
|
|
||||||
|
|
||||||
NAME
|
|
||||||
----
|
|
||||||
cdist-type__ipset - Manage ipset sets
|
|
||||||
|
|
||||||
DESCRIPTION
|
|
||||||
-----------
|
|
||||||
Making use of ipset sets in iptable rules can make your rules more expressive, maintainable and efficient.
|
|
||||||
|
|
||||||
REQUIRED PARAMETERS
|
|
||||||
-------------------
|
|
||||||
type
|
|
||||||
One of the supported ipset set types, for a full list see:
|
|
||||||
|
|
||||||
``ipset help``
|
|
||||||
|
|
||||||
OPTIONAL PARAMETERS
|
|
||||||
-------------------
|
|
||||||
add
|
|
||||||
The entry that must exist in the given set.
|
|
||||||
|
|
||||||
Can be used multiple times.
|
|
||||||
del
|
|
||||||
The entry that must not exist in the given set.
|
|
||||||
|
|
||||||
Can be used multiple times.
|
|
||||||
state
|
|
||||||
Can be:
|
|
||||||
|
|
||||||
- ``present``: ensure that the given set exists.
|
|
||||||
- ``absent``: ensure the given set doesn't exist.
|
|
||||||
|
|
||||||
BOOLEAN PARAMETERS
|
|
||||||
------------------
|
|
||||||
None.
|
|
||||||
|
|
||||||
EXAMPLES
|
|
||||||
--------
|
|
||||||
|
|
||||||
.. code-block:: sh
|
|
||||||
|
|
||||||
# Make sure a set with the given name/type exists:
|
|
||||||
__ipset testset1 --type hash:ip
|
|
||||||
|
|
||||||
# Ensure allowed_ssh_clients contains private range:
|
|
||||||
__ipset allowed_ssh_hosts --type hash:net \
|
|
||||||
--add 192.168.0.0/24 --add 10.0.0.0/8
|
|
||||||
|
|
||||||
# Make sure host is not on the blocked list:
|
|
||||||
__ipset blocked_hosts --type hash:ip \
|
|
||||||
--del 1.2.3.4
|
|
||||||
|
|
||||||
|
|
||||||
SEE ALSO
|
|
||||||
--------
|
|
||||||
:strong:`cdist-type__iptables_rule`\ (7), :strong:`iptables`\ (8)
|
|
||||||
|
|
||||||
AUTHORS
|
|
||||||
-------
|
|
||||||
Mesar Hameed <mesar.hameed--@--gmail.com>
|
|
||||||
|
|
||||||
COPYING
|
|
||||||
-------
|
|
||||||
Copyright \(C) 2021 Mesar Hameed. 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,45 +0,0 @@
|
||||||
#!/bin/sh -e
|
|
||||||
#
|
|
||||||
# 2021 Mesar Hameed (mesar.hameed 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/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
os=$(cat "$__global/explorer/os")
|
|
||||||
case "$os" in
|
|
||||||
debian)
|
|
||||||
:
|
|
||||||
;;
|
|
||||||
ubuntu)
|
|
||||||
:
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "OS $os currently not supported" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
export CDIST_ORDER_DEPENDENCY=on
|
|
||||||
|
|
||||||
# install packages
|
|
||||||
__package ipset
|
|
||||||
|
|
||||||
__file /etc/init.d/ipset-persistent --mode 0755 --source "${__type}/files/ipset-persistent"
|
|
||||||
__file /usr/local/bin/ipsets-restore --mode 0755 --source "${__type}/files/ipsets-restore"
|
|
||||||
__file /usr/local/bin/ipsets-save --mode 0755 --source "${__type}/files/ipsets-save"
|
|
||||||
__systemd_unit ipset-persistent --enablement-state enabled --restart
|
|
||||||
|
|
||||||
unset CDIST_ORDER_DEPENDENCY
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
present
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
state
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
add
|
|
||||||
del
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
type
|
|
||||||
|
|
@ -1,4 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
# Nico Schottelius
|
||||||
|
# Zürisee, Mon Sep 2 18:38:27 CEST 2013
|
||||||
|
#
|
||||||
### BEGIN INIT INFO
|
### BEGIN INIT INFO
|
||||||
# Provides: iptables
|
# Provides: iptables
|
||||||
# Required-Start: $local_fs $remote_fs
|
# Required-Start: $local_fs $remote_fs
|
||||||
|
|
@ -11,72 +14,34 @@
|
||||||
# and saves/restores previous status
|
# and saves/restores previous status
|
||||||
### END INIT INFO
|
### END INIT INFO
|
||||||
|
|
||||||
# Originally written by:
|
|
||||||
# Nico Schottelius
|
|
||||||
# Zürisee, Mon Sep 2 18:38:27 CEST 2013
|
|
||||||
#
|
|
||||||
# 2013 Nico Schottelius (nico-cdist at schottelius.org)
|
|
||||||
# 2020 Matthias Stecher (matthiasstecher at gmx.de)
|
|
||||||
#
|
|
||||||
# This file is distributed with cdist and licenced under the
|
|
||||||
# GNU GPLv3+ WITHOUT ANY WARRANTY.
|
|
||||||
|
|
||||||
|
|
||||||
# Read files and execute the content with the given commands
|
|
||||||
#
|
|
||||||
# Arguments:
|
|
||||||
# 1: Directory
|
|
||||||
# 2..n: Commands which should be used to execute the file content
|
|
||||||
gothrough() {
|
|
||||||
cd "$1" || return
|
|
||||||
shift
|
|
||||||
|
|
||||||
# iterate through all rules and continue if it's not a file
|
|
||||||
for rule in *; do
|
|
||||||
[ -f "$rule" ] || continue
|
|
||||||
echo "Appling iptables rule $rule ..."
|
|
||||||
|
|
||||||
# execute it with all commands specificed
|
|
||||||
ruleparam="$(cat "$rule")"
|
|
||||||
for cmd in "$@"; do
|
|
||||||
# Command and Rule should be split.
|
|
||||||
# shellcheck disable=SC2046
|
|
||||||
command $cmd $ruleparam
|
|
||||||
done
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
# Shortcut for iptables command to do IPv4 and v6
|
|
||||||
# only applies to the "reset" target
|
|
||||||
iptables() {
|
|
||||||
command iptables "$@"
|
|
||||||
command ip6tables "$@"
|
|
||||||
}
|
|
||||||
|
|
||||||
basedir=/etc/iptables.d
|
basedir=/etc/iptables.d
|
||||||
status4="${basedir}/.pre-start"
|
status="${basedir}/.pre-start"
|
||||||
status6="${basedir}/.pre-start6"
|
|
||||||
|
|
||||||
case $1 in
|
case $1 in
|
||||||
start)
|
start)
|
||||||
# Save status
|
# Save status
|
||||||
iptables-save > "$status4"
|
iptables-save > "$status"
|
||||||
ip6tables-save > "$status6"
|
|
||||||
|
|
||||||
# Apply our ruleset
|
# Apply our ruleset
|
||||||
gothrough "$basedir" iptables
|
cd "$basedir" || exit
|
||||||
#gothrough "$basedir/v4" iptables # conflicts with $basedir
|
count="$(find . ! -name . -prune | wc -l)"
|
||||||
gothrough "$basedir/v6" ip6tables
|
|
||||||
gothrough "$basedir/all" iptables ip6tables
|
# Only do something if there are rules
|
||||||
|
if [ "$count" -ge 1 ]; then
|
||||||
|
for rule in *; do
|
||||||
|
echo "Applying iptables rule $rule ..."
|
||||||
|
# Rule should be split.
|
||||||
|
# shellcheck disable=SC2046
|
||||||
|
iptables $(cat "$rule")
|
||||||
|
done
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
stop)
|
stop)
|
||||||
# Restore from status before, if there is something to restore
|
# Restore from status before, if there is something to restore
|
||||||
if [ -f "$status4" ]; then
|
if [ -f "$status" ]; then
|
||||||
iptables-restore < "$status4"
|
iptables-restore < "$status"
|
||||||
fi
|
|
||||||
if [ -f "$status6" ]; then
|
|
||||||
ip6tables-restore < "$status6"
|
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
restart)
|
restart)
|
||||||
|
|
|
||||||
|
|
@ -10,24 +10,7 @@ DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
This cdist type deploys an init script that triggers
|
This cdist type deploys an init script that triggers
|
||||||
the configured rules and also re-applies them on
|
the configured rules and also re-applies them on
|
||||||
configuration. Rules are written from __iptables_rule
|
configuration.
|
||||||
into the folder ``/etc/iptables.d/``.
|
|
||||||
|
|
||||||
It reads all rules from the base folder as rules for IPv4.
|
|
||||||
Rules in the subfolder ``v6/`` are IPv6 rules. Rules in
|
|
||||||
the subfolder ``all/`` are applied to both rule tables. All
|
|
||||||
files contain the arguments for a single ``iptables`` and/or
|
|
||||||
``ip6tables`` command.
|
|
||||||
|
|
||||||
Rules are applied in the following order:
|
|
||||||
1. All IPv4 rules
|
|
||||||
2. All IPv6 rules
|
|
||||||
2. All rules that should be applied to both tables
|
|
||||||
|
|
||||||
The order of the rules that will be applied are definite
|
|
||||||
from the result the shell glob returns, which should be
|
|
||||||
alphabetical. If rules must be applied in a special order,
|
|
||||||
prefix them with a number like ``02-some-rule``.
|
|
||||||
|
|
||||||
|
|
||||||
REQUIRED PARAMETERS
|
REQUIRED PARAMETERS
|
||||||
|
|
@ -41,7 +24,7 @@ None
|
||||||
EXAMPLES
|
EXAMPLES
|
||||||
--------
|
--------
|
||||||
|
|
||||||
None (__iptables_apply is used by __iptables_rule automatically)
|
None (__iptables_apply is used by __iptables_rule)
|
||||||
|
|
||||||
|
|
||||||
SEE ALSO
|
SEE ALSO
|
||||||
|
|
@ -52,13 +35,11 @@ SEE ALSO
|
||||||
AUTHORS
|
AUTHORS
|
||||||
-------
|
-------
|
||||||
Nico Schottelius <nico-cdist--@--schottelius.org>
|
Nico Schottelius <nico-cdist--@--schottelius.org>
|
||||||
Matthias Stecher <matthiasstecher--@--gmx.de>
|
|
||||||
|
|
||||||
|
|
||||||
COPYING
|
COPYING
|
||||||
-------
|
-------
|
||||||
Copyright \(C) 2013 Nico Schottelius.
|
Copyright \(C) 2013 Nico Schottelius. You can redistribute it
|
||||||
Copyright \(C) 2020 Matthias Stecher.
|
and/or modify it under the terms of the GNU General Public License as
|
||||||
You can redistribute it and/or modify it under the terms of the GNU
|
published by the Free Software Foundation, either version 3 of the
|
||||||
General Public License as published by the Free Software Foundation,
|
License, or (at your option) any later version.
|
||||||
either version 3 of the License, or (at your option) any later version.
|
|
||||||
|
|
|
||||||
|
|
@ -11,10 +11,6 @@ DESCRIPTION
|
||||||
This cdist type allows you to manage iptable rules
|
This cdist type allows you to manage iptable rules
|
||||||
in a distribution independent manner.
|
in a distribution independent manner.
|
||||||
|
|
||||||
See :strong:`cdist-type__iptables_apply`\ (7) for the
|
|
||||||
execution order of these rules. It will be executed
|
|
||||||
automaticly to apply all rules non-volaite.
|
|
||||||
|
|
||||||
|
|
||||||
REQUIRED PARAMETERS
|
REQUIRED PARAMETERS
|
||||||
-------------------
|
-------------------
|
||||||
|
|
@ -29,24 +25,6 @@ state
|
||||||
'present' or 'absent', defaults to 'present'
|
'present' or 'absent', defaults to 'present'
|
||||||
|
|
||||||
|
|
||||||
BOOLEAN PARAMETERS
|
|
||||||
------------------
|
|
||||||
All rules without any of these parameters will be treated like ``--v4`` because
|
|
||||||
of backward compatibility.
|
|
||||||
|
|
||||||
v4
|
|
||||||
Explicitly set it as rule for IPv4. If IPv6 is set, too, it will be
|
|
||||||
threaten like ``--all``. Will be the default if nothing else is set.
|
|
||||||
|
|
||||||
v6
|
|
||||||
Explicitly set it as rule for IPv6. If IPv4 is set, too, it will be
|
|
||||||
threaten like ``--all``.
|
|
||||||
|
|
||||||
all
|
|
||||||
Set the rule for both IPv4 and IPv6. It will be saved separately from the
|
|
||||||
other rules.
|
|
||||||
|
|
||||||
|
|
||||||
EXAMPLES
|
EXAMPLES
|
||||||
--------
|
--------
|
||||||
|
|
||||||
|
|
@ -70,16 +48,6 @@ EXAMPLES
|
||||||
--state absent
|
--state absent
|
||||||
|
|
||||||
|
|
||||||
# IPv4-only rule for ICMPv4
|
|
||||||
__iptables_rule icmp-v4 --v4 --rule "-A INPUT -p icmp -j ACCEPT"
|
|
||||||
# IPv6-only rule for ICMPv6
|
|
||||||
__iptables_rule icmp-v6 --v6 --rule "-A INPUT -p icmpv6 -j ACCEPT"
|
|
||||||
|
|
||||||
# doing something for the dual stack
|
|
||||||
__iptables_rule fwd-eth0-eth1 --v4 --v6 --rule "-A INPUT -i eth0 -o eth1 -j ACCEPT"
|
|
||||||
__iptables_rule fwd-eth1-eth0 --all --rule "-A -o eth1 -i eth0 -m state --state RELATED,ESTABLISHED -j ACCEPT"
|
|
||||||
|
|
||||||
|
|
||||||
SEE ALSO
|
SEE ALSO
|
||||||
--------
|
--------
|
||||||
:strong:`cdist-type__iptables_apply`\ (7), :strong:`iptables`\ (8)
|
:strong:`cdist-type__iptables_apply`\ (7), :strong:`iptables`\ (8)
|
||||||
|
|
@ -88,13 +56,11 @@ SEE ALSO
|
||||||
AUTHORS
|
AUTHORS
|
||||||
-------
|
-------
|
||||||
Nico Schottelius <nico-cdist--@--schottelius.org>
|
Nico Schottelius <nico-cdist--@--schottelius.org>
|
||||||
Matthias Stecher <matthiasstecher--@--gmx.de>
|
|
||||||
|
|
||||||
|
|
||||||
COPYING
|
COPYING
|
||||||
-------
|
-------
|
||||||
Copyright \(C) 2013 Nico Schottelius.
|
Copyright \(C) 2013 Nico Schottelius. You can redistribute it
|
||||||
Copyright \(C) 2020 Matthias Stecher.
|
and/or modify it under the terms of the GNU General Public License as
|
||||||
You can redistribute it and/or modify it under the terms of the GNU
|
published by the Free Software Foundation, either version 3 of the
|
||||||
General Public License as published by the Free Software Foundation,
|
License, or (at your option) any later version.
|
||||||
either version 3 of the License, or (at your option) any later version.
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
#
|
#
|
||||||
# 2013 Nico Schottelius (nico-cdist at schottelius.org)
|
# 2013 Nico Schottelius (nico-cdist at schottelius.org)
|
||||||
# 2020 Matthias Stecher (matthiasstecher at gmx.de)
|
|
||||||
#
|
#
|
||||||
# This file is part of cdist.
|
# This file is part of cdist.
|
||||||
#
|
#
|
||||||
|
|
@ -25,36 +24,12 @@ base_dir=/etc/iptables.d
|
||||||
name="$__object_id"
|
name="$__object_id"
|
||||||
state="$(cat "$__object/parameter/state")"
|
state="$(cat "$__object/parameter/state")"
|
||||||
|
|
||||||
if [ -f "$__object/parameter/v4" ]; then
|
|
||||||
only_v4="yes"
|
|
||||||
# $specific_dir is $base_dir
|
|
||||||
fi
|
|
||||||
if [ -f "$__object/parameter/v6" ]; then
|
|
||||||
only_v6="yes"
|
|
||||||
specific_dir="$base_dir/v6"
|
|
||||||
fi
|
|
||||||
# If rules should be set for both protocols
|
|
||||||
if { [ "$only_v4" = "yes" ] && [ "$only_v6" = "yes" ]; } ||
|
|
||||||
[ -f "$__object/parameter/all" ]; then
|
|
||||||
|
|
||||||
# all to a specific directory
|
|
||||||
specific_dir="$base_dir/all"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# set rule directory based on if it's the base or subdirectory
|
|
||||||
rule_dir="${specific_dir:-$base_dir}"
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Basic setup
|
# Basic setup
|
||||||
#
|
#
|
||||||
|
|
||||||
__directory "$base_dir" --state present
|
__directory "$base_dir" --state present
|
||||||
|
|
||||||
# sub-directory if required
|
|
||||||
if [ "$specific_dir" ]; then
|
|
||||||
require="__directory/$base_dir" __directory "$specific_dir" --state present
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Have apply do the real job
|
# Have apply do the real job
|
||||||
require="$__object_name" __iptables_apply
|
require="$__object_name" __iptables_apply
|
||||||
|
|
||||||
|
|
@ -62,15 +37,6 @@ require="$__object_name" __iptables_apply
|
||||||
# The rule
|
# The rule
|
||||||
#
|
#
|
||||||
|
|
||||||
for dir in "$base_dir" "$base_dir/v6" "$base_dir/all"; do
|
require="__directory/$base_dir" __file "$base_dir/${name}" \
|
||||||
# defaults to absent except the directory that should contain the file
|
--source "$__object/parameter/rule" \
|
||||||
if [ "$rule_dir" = "$dir" ]; then
|
--state "$state"
|
||||||
curr_state="$state"
|
|
||||||
else
|
|
||||||
curr_state="absent"
|
|
||||||
fi
|
|
||||||
|
|
||||||
require="__directory/$rule_dir" __file "$dir/$name" \
|
|
||||||
--source "$__object/parameter/rule" \
|
|
||||||
--state "$curr_state"
|
|
||||||
done
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
all
|
|
||||||
v4
|
|
||||||
v6
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
This type is deprecated. Please use __localedef instead.
|
|
||||||
|
|
@ -1,100 +0,0 @@
|
||||||
#!/bin/sh -e
|
|
||||||
#
|
|
||||||
# 2020 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/>.
|
|
||||||
#
|
|
||||||
# This explorer determines if the locale is defined on the target system.
|
|
||||||
# Will print nothing on error.
|
|
||||||
#
|
|
||||||
# Possible output:
|
|
||||||
# present:
|
|
||||||
# the main locale (and possibly aliases) is present
|
|
||||||
# absent:
|
|
||||||
# neither the main locale nor any aliases are present
|
|
||||||
# alias-present:
|
|
||||||
# the main locale is absent, but at least one of its aliases is present
|
|
||||||
#
|
|
||||||
|
|
||||||
# Hardcoded, create a pull request in case it is at another location for
|
|
||||||
# some other distro. (cf. gencode-remote)
|
|
||||||
aliasfile='/usr/share/locale/locale.alias'
|
|
||||||
|
|
||||||
command -v locale >/dev/null 2>&1 || exit 0
|
|
||||||
|
|
||||||
locales=$(locale -a)
|
|
||||||
|
|
||||||
parse_locale() {
|
|
||||||
# This function will split locales into their parts. Locale strings are
|
|
||||||
# usually of the form: [language[_territory][.codeset][@modifier]]
|
|
||||||
# For simplicity, language and territory are not separated by this function.
|
|
||||||
# Old Linux systems were also using "english" or "german" as locale strings.
|
|
||||||
# Usage: parse_locale locale_str lang_var codeset_var modifier_var
|
|
||||||
eval "${2:?}"="$(expr "$1" : '\([^.@]*\)')"
|
|
||||||
eval "${3:?}"="$(expr "$1" : '[^.]*\.\([^@]*\)')"
|
|
||||||
eval "${4:?}"="$(expr "$1" : '.*@\(.*\)$')"
|
|
||||||
}
|
|
||||||
|
|
||||||
format_locale() {
|
|
||||||
# Usage: format_locale language codeset modifier
|
|
||||||
printf '%s' "$1"
|
|
||||||
test -z "$2" || printf '.%s' "$2"
|
|
||||||
test -z "$3" || printf '@%s' "$3"
|
|
||||||
printf '\n'
|
|
||||||
}
|
|
||||||
|
|
||||||
gnu_normalize_codeset() {
|
|
||||||
# reimplementation of glibc/locale/programs/localedef.c normalize_codeset()
|
|
||||||
echo "$*" | tr '[:upper:]' '[:lower:]' | tr -cd '[:alnum:]'
|
|
||||||
}
|
|
||||||
|
|
||||||
locale_available() (
|
|
||||||
echo "${locales}" | grep -qxF "$1" || {
|
|
||||||
# glibc uses "normalized" locale names in archives.
|
|
||||||
# If a locale is stored in an archive, the normalized name will be
|
|
||||||
# printed by locale, so that needs to be checked, too.
|
|
||||||
localename=$(
|
|
||||||
parse_locale "$1" _lang _codeset _modifier \
|
|
||||||
&& format_locale "${_lang:?}" "$(gnu_normalize_codeset "${_codeset?}")" \
|
|
||||||
"${_modifier?}")
|
|
||||||
echo "${locales}" | grep -qxF "${localename}"
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
if locale_available "${__object_id:?}"
|
|
||||||
then
|
|
||||||
echo present
|
|
||||||
else
|
|
||||||
# NOTE: locale.alias can be symlinked.
|
|
||||||
if test -e "${aliasfile}"
|
|
||||||
then
|
|
||||||
# Check if one of the aliases of the locale is defined
|
|
||||||
baselocale=$(
|
|
||||||
parse_locale "${__object_id:?}" _lang _codeset _modifiers \
|
|
||||||
&& format_locale "${_lang}" "${_codeset}")
|
|
||||||
while read -r _alias _localename
|
|
||||||
do
|
|
||||||
if test "${_localename}" = "${baselocale}" \
|
|
||||||
&& echo "${locales}" | grep -qxF "${_alias}"
|
|
||||||
then
|
|
||||||
echo alias-present
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
done <"${aliasfile}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo absent
|
|
||||||
fi
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
# -*- mode: sh; indent-tabs-mode: t -*-
|
|
||||||
|
|
||||||
gnu_normalize_codeset() {
|
|
||||||
echo "$*" | tr -cd '[:alnum:]' | tr '[:upper:]' '[:lower:]'
|
|
||||||
}
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
# -*- mode: sh; indent-tabs-mode:t -*-
|
|
||||||
|
|
||||||
parse_locale() {
|
|
||||||
# This function will split locales into their parts. Locale strings are
|
|
||||||
# usually of the form: [language[_territory][.codeset][@modifier]]
|
|
||||||
# For simplicity, language and territory are not separated by this function.
|
|
||||||
# Old Linux systems were also using "english" or "german" as locale strings.
|
|
||||||
# Usage: parse_locale locale_str lang_var codeset_var modifier_var
|
|
||||||
eval "${2:?}"="$(expr "$1" : '\([^.@]*\)')"
|
|
||||||
eval "${3:?}"="$(expr "$1" : '[^.]*\.\([^@]*\)')"
|
|
||||||
eval "${4:?}"="$(expr "$1" : '.*@\(.*\)$')"
|
|
||||||
}
|
|
||||||
|
|
||||||
format_locale() {
|
|
||||||
# Usage: format_locale language codeset modifier
|
|
||||||
printf '%s' "$1"
|
|
||||||
test -z "$2" || printf '.%s' "$2"
|
|
||||||
test -z "$3" || printf '@%s' "$3"
|
|
||||||
printf '\n'
|
|
||||||
}
|
|
||||||
|
|
@ -1,136 +0,0 @@
|
||||||
#!/bin/sh -e
|
|
||||||
#
|
|
||||||
# 2013-2019 Nico Schottelius (nico-cdist at schottelius.org)
|
|
||||||
# 2020 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/>.
|
|
||||||
#
|
|
||||||
# Manage system locales using localedef(1).
|
|
||||||
#
|
|
||||||
|
|
||||||
# shellcheck source=cdist/conf/type/__localedef/files/lib/locale.sh
|
|
||||||
. "${__type:?}/files/lib/locale.sh"
|
|
||||||
# shellcheck source=cdist/conf/type/__localedef/files/lib/glibc.sh
|
|
||||||
. "${__type:?}/files/lib/glibc.sh"
|
|
||||||
|
|
||||||
state_is=$(cat "${__object:?}/explorer/state")
|
|
||||||
state_should=$(cat "${__object:?}/parameter/state")
|
|
||||||
|
|
||||||
test "${state_should}" = 'present' -o "${state_should}" = 'absent' || {
|
|
||||||
printf 'Invalid state: %s\n' "${state_should}" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# NOTE: If state explorer fails (e.g. locale(1) missing), the following check
|
|
||||||
# will always fail and let definition/removal run.
|
|
||||||
if test "${state_is}" = "${state_should}"
|
|
||||||
then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
locale=${__object_id:?}
|
|
||||||
os=$(cat "${__global:?}/explorer/os")
|
|
||||||
|
|
||||||
if expr "${locale}" : '.*/' >/dev/null
|
|
||||||
then
|
|
||||||
printf 'Paths as locales are not supported.\n' >&2
|
|
||||||
printf '__object_id is: %s\n' "${locale}" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
: "${lang=}" "${codeset=}" "${modifier=}" # declare variables for shellcheck
|
|
||||||
parse_locale "${locale}" lang codeset modifier
|
|
||||||
|
|
||||||
|
|
||||||
case ${os}
|
|
||||||
in
|
|
||||||
(alpine|openwrt)
|
|
||||||
printf '%s does not support locales.\n' "${os}" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
(archlinux|debian|devuan|ubuntu|suse|centos|fedora|redhat|scientific)
|
|
||||||
# FIXME: The code below only works for glibc-based installations.
|
|
||||||
|
|
||||||
# NOTE: Hardcoded, create a pull request in case it is at another
|
|
||||||
# location for some opther distro.
|
|
||||||
# NOTE: locale.alias can be symlinked (e.g. Debian)
|
|
||||||
aliasfile='/usr/share/locale/locale.alias'
|
|
||||||
|
|
||||||
case ${state_should}
|
|
||||||
in
|
|
||||||
(present)
|
|
||||||
input=$(format_locale "${lang}" '' "${modifier}")
|
|
||||||
cat <<-EOF
|
|
||||||
set --
|
|
||||||
if test -e '${aliasfile}'
|
|
||||||
then
|
|
||||||
set -- -A '${aliasfile}'
|
|
||||||
fi
|
|
||||||
|
|
||||||
localedef -i '${input}' -f '${codeset}' "\$@" '${locale}'
|
|
||||||
EOF
|
|
||||||
;;
|
|
||||||
(absent)
|
|
||||||
main_localename=$(format_locale "${lang}" "$(gnu_normalize_codeset "${codeset}")" "${modifier}")
|
|
||||||
|
|
||||||
cat <<-EOF
|
|
||||||
while read -r _alias _localename
|
|
||||||
do
|
|
||||||
if test "\${_localename}" = '$(format_locale "${lang}" "${codeset}")'
|
|
||||||
then
|
|
||||||
localedef --delete-from-archive "\${_alias}"
|
|
||||||
fi
|
|
||||||
done <'${aliasfile}'
|
|
||||||
EOF
|
|
||||||
|
|
||||||
if test "${state_is}" = present
|
|
||||||
then
|
|
||||||
printf "localedef --delete-from-archive '%s'\n" "${main_localename}"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
(freebsd)
|
|
||||||
case ${state_should}
|
|
||||||
in
|
|
||||||
(present)
|
|
||||||
if expr "$(grep -oe '^[0-9]*' "${__global:?}/explorer/os_version")" '>=' 11 >/dev/null
|
|
||||||
then
|
|
||||||
# localedef(1) is available with FreeBSD >= 11
|
|
||||||
printf "localedef -i '%s' -f '%s' '%s'\n" "${input}" "${codeset}" "${locale}"
|
|
||||||
else
|
|
||||||
printf 'localedef(1) was added to FreeBSD starting with version 11.\n' >&2
|
|
||||||
printf 'Please upgrade your FreeBSD installation to use %s.\n' "${__type##*/}" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
(absent)
|
|
||||||
printf "rm -R '/usr/share/locale/%s'\n" "${locale}"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
(netbsd|openbsd)
|
|
||||||
# NetBSD/OpenBSD are missing localedef(1).
|
|
||||||
# We also do not delete defined locales because they can't be recreated.
|
|
||||||
echo "${os} is lacking localedef(1). Locale management unavailable." >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
(*)
|
|
||||||
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
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
@ -1,60 +0,0 @@
|
||||||
cdist-type__localedef(7)
|
|
||||||
========================
|
|
||||||
|
|
||||||
NAME
|
|
||||||
----
|
|
||||||
cdist-type__localedef - Define and remove system locales
|
|
||||||
|
|
||||||
|
|
||||||
DESCRIPTION
|
|
||||||
-----------
|
|
||||||
This cdist type allows you to define locales on the system using
|
|
||||||
:strong:`localedef`\ (1) or remove them.
|
|
||||||
On systems that don't support definition of new locales, the type will raise an
|
|
||||||
error.
|
|
||||||
|
|
||||||
**NB:** This type respects the glibc ``locale.alias`` file,
|
|
||||||
i.e. it defines alias locales or deletes aliases of a locale when it is removed.
|
|
||||||
It is not possible, however, to use alias names to define locales or only remove
|
|
||||||
certain aliases of a locale.
|
|
||||||
|
|
||||||
|
|
||||||
OPTIONAL PARAMETERS
|
|
||||||
-------------------
|
|
||||||
state
|
|
||||||
``present`` or ``absent``. Defaults to ``present``.
|
|
||||||
|
|
||||||
|
|
||||||
EXAMPLES
|
|
||||||
--------
|
|
||||||
|
|
||||||
.. code-block:: sh
|
|
||||||
|
|
||||||
# Add locale de_CH.UTF-8
|
|
||||||
__localedef de_CH.UTF-8
|
|
||||||
|
|
||||||
# Same as above, but more explicit
|
|
||||||
__localedef de_CH.UTF-8 --state present
|
|
||||||
|
|
||||||
# Remove colourful British English
|
|
||||||
__localedef en_GB.UTF-8 --state absent
|
|
||||||
|
|
||||||
|
|
||||||
SEE ALSO
|
|
||||||
--------
|
|
||||||
:strong:`locale`\ (1),
|
|
||||||
:strong:`localedef`\ (1),
|
|
||||||
:strong:`cdist-type__locale_system`\ (7)
|
|
||||||
|
|
||||||
|
|
||||||
AUTHORS
|
|
||||||
-------
|
|
||||||
| Dennis Camera <dennis.camera--@--ssrq-sds-fds.ch>
|
|
||||||
| Nico Schottelius <nico-cdist--@--schottelius.org>
|
|
||||||
|
|
||||||
|
|
||||||
COPYING
|
|
||||||
-------
|
|
||||||
Copyright \(C) 2013-2019 Nico Schottelius, 2020 Dennis Camera. Free use of this
|
|
||||||
software is granted under the terms of the GNU General Public License version 3
|
|
||||||
or later (GPLv3+).
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
#!/bin/sh -e
|
|
||||||
#
|
|
||||||
# 2013-2019 Nico Schottelius (nico-cdist at schottelius.org)
|
|
||||||
# 2015 David Hürlimann (david at ungleich.ch)
|
|
||||||
# 2020 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/>.
|
|
||||||
#
|
|
||||||
# Install required packages.
|
|
||||||
#
|
|
||||||
|
|
||||||
case $(cat "${__global:?}/explorer/os")
|
|
||||||
in
|
|
||||||
(debian|devuan)
|
|
||||||
__package_apt locales --state present
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
present
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
state
|
|
||||||
|
|
@ -75,7 +75,7 @@ execcmd(){
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [ -z "${pkg_bootstrapped}" ]; then
|
if [ -z "${pkg_bootstrapped}" ]; then
|
||||||
echo "ASSUME_ALWAYS_YES=yes pkg bootstrap >/dev/null 2>&1"
|
echo "pkg bootstrap -y >/dev/null 2>&1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "$_cmd >/dev/null 2>&1" # Silence the output of the command
|
echo "$_cmd >/dev/null 2>&1" # Silence the output of the command
|
||||||
|
|
|
||||||
|
|
@ -1,121 +0,0 @@
|
||||||
#!/bin/sh -e
|
|
||||||
#
|
|
||||||
# 2020 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/>.
|
|
||||||
#
|
|
||||||
# Determines the current state of the config option.
|
|
||||||
# Possible output:
|
|
||||||
# - present: "should" option present in config file
|
|
||||||
# - default: the "should" option is the default -> don’t know if present
|
|
||||||
# - absent: no such option present in config file
|
|
||||||
#
|
|
||||||
|
|
||||||
joinlines() { sed -n -e H -e "\${x;s/^\\n//;s/\\n/${1:?}/g;p;}"; }
|
|
||||||
trlower() { tr '[:upper:]' '[:lower:]'; }
|
|
||||||
tolower() { printf '%s' "$*" | trlower; }
|
|
||||||
|
|
||||||
default_value() {
|
|
||||||
sshd -T -f /dev/null -C "$(make_conn_spec)" \
|
|
||||||
| sed -n -e 's/^'"$(tolower "${1:?}")"'[[:blank:]]\{1,\}//p'
|
|
||||||
}
|
|
||||||
|
|
||||||
make_conn_spec() {
|
|
||||||
if test -s "${__object:?}/parameter/match"
|
|
||||||
then
|
|
||||||
_match_file="${__object:?}/parameter/match"
|
|
||||||
else
|
|
||||||
_match_file='/dev/null'
|
|
||||||
fi
|
|
||||||
|
|
||||||
for _kw in \
|
|
||||||
addr=Address \
|
|
||||||
user=User \
|
|
||||||
host=Host \
|
|
||||||
laddr=LocalAddress \
|
|
||||||
lport=LocalPort \
|
|
||||||
rdomain=RDomain
|
|
||||||
do
|
|
||||||
_specname=${_kw%%=*}
|
|
||||||
_confname=$(tolower "${_kw#*=}")
|
|
||||||
while read -r _k _v
|
|
||||||
do
|
|
||||||
if test "$(tolower "${_k}")" = "${_confname}"
|
|
||||||
then
|
|
||||||
printf '%s=%s\n' "${_specname}" "${_v}"
|
|
||||||
continue 2
|
|
||||||
fi
|
|
||||||
done <"${_match_file}"
|
|
||||||
|
|
||||||
# NOTE: Print test spec even for empty keys to suppress errors like:
|
|
||||||
# 'Match User' in configuration but 'user' not in connection test specification.
|
|
||||||
# except lport:
|
|
||||||
# Invalid port '' in test mode specification lport=
|
|
||||||
test "${_specname}" = 'lport' || printf '%s=\n' "${_specname}"
|
|
||||||
done \
|
|
||||||
| joinlines ','
|
|
||||||
unset _match_file
|
|
||||||
}
|
|
||||||
|
|
||||||
sshd_config_file=$(cat "${__object:?}/parameter/file")
|
|
||||||
state_should=$(cat "${__object:?}/parameter/state")
|
|
||||||
|
|
||||||
if test -s "${__object:?}/parameter/option"
|
|
||||||
then
|
|
||||||
option_name=$(cat "${__object:?}/parameter/option")
|
|
||||||
else
|
|
||||||
option_name=${__object_id:?}
|
|
||||||
fi
|
|
||||||
|
|
||||||
value_should=$(cat "${__object:?}/parameter/value" 2>/dev/null) \
|
|
||||||
|| test "${state_should}" = absent || exit 0 # param optional if --state absent
|
|
||||||
|
|
||||||
command -v sshd >/dev/null 2>&1 || {
|
|
||||||
echo 'Cannot find sshd.' >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
test -e "${sshd_config_file}" || {
|
|
||||||
echo 'absent'
|
|
||||||
exit 0
|
|
||||||
}
|
|
||||||
|
|
||||||
value_is=$(
|
|
||||||
sshd -T -f "${sshd_config_file}" -C "$(make_conn_spec)" \
|
|
||||||
| sed -n -e 's/^'"$(tolower "${option_name}")"'[[:blank:]]\{1,\}//p')
|
|
||||||
|
|
||||||
if printf '%s\n' "${value_is}" | {
|
|
||||||
if test -n "${value_should}"
|
|
||||||
then
|
|
||||||
grep -q -x -F "${value_should}"
|
|
||||||
else
|
|
||||||
# if no value provided, assume "any" value
|
|
||||||
grep -q -e .
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
then
|
|
||||||
if default_value "${option_name}" | grep -q -x -F "${value_is}"
|
|
||||||
then
|
|
||||||
# Might produce false positives for default values.
|
|
||||||
# TODO: Manual checking should be done, but for simplicity, this case is
|
|
||||||
# currently ignored here.
|
|
||||||
echo default
|
|
||||||
else
|
|
||||||
echo present
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo absent
|
|
||||||
fi
|
|
||||||
|
|
@ -1,293 +0,0 @@
|
||||||
# -*- mode: awk; indent-tabs-mode: t -*-
|
|
||||||
|
|
||||||
function usage() {
|
|
||||||
print_err("Usage: awk -f update_sshd_config.awk -- -o set|unset [-m 'User git'] -l 'X11Forwarding no' /etc/ssh/sshd_config")
|
|
||||||
}
|
|
||||||
|
|
||||||
function print_err(s) { print s | "cat >&2" }
|
|
||||||
|
|
||||||
function alength(a, i) {
|
|
||||||
for (i = 0; (i + 1) in a; ++i);
|
|
||||||
return i
|
|
||||||
}
|
|
||||||
|
|
||||||
function join(sep, a, i, s) {
|
|
||||||
for (i = i ? i : 1; i in a; i++)
|
|
||||||
s = s sep a[i]
|
|
||||||
return substr(s, 2)
|
|
||||||
}
|
|
||||||
|
|
||||||
function getopt(opts, argv, target, files, i, c, lv, idx, nf) {
|
|
||||||
# trivial getopt(3) implementation; only basic functionality
|
|
||||||
if (argv[1] == "--") i++
|
|
||||||
for (i += 1; i in argv; i++) {
|
|
||||||
if (lv) { target[c] = argv[i]; lv = 0; continue }
|
|
||||||
if (argv[i] ~ /^-/) {
|
|
||||||
c = substr(argv[i], 2, 1)
|
|
||||||
idx = index(opts, c)
|
|
||||||
if (!idx) {
|
|
||||||
print_err(sprintf("invalid option -%c\n", c))
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if (substr(opts, idx + 1, 1) == ":") {
|
|
||||||
# option takes argument
|
|
||||||
if (length(argv[i]) > 2)
|
|
||||||
target[c] = substr(argv[i], 3)
|
|
||||||
else
|
|
||||||
lv = 1
|
|
||||||
} else {
|
|
||||||
target[c] = 1
|
|
||||||
}
|
|
||||||
} else
|
|
||||||
files[++nf] = argv[i]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# tokenise configuration line
|
|
||||||
# this function mimics the counterpart in OpenSSH (misc.c)
|
|
||||||
# but it returns two (next token SUBSEP rest) because I didn’t want to have to
|
|
||||||
# simulate any pointer magic.
|
|
||||||
function strdelim_internal(s, split_equals, old) {
|
|
||||||
if (!s)
|
|
||||||
return ""
|
|
||||||
|
|
||||||
old = s
|
|
||||||
|
|
||||||
if (!match(s, WHITESPACE "|" QUOTE "" (split_equals ? "|" EQUALS : "")))
|
|
||||||
return s
|
|
||||||
|
|
||||||
s = substr(s, RSTART)
|
|
||||||
old = substr(old, 1, RSTART - 1)
|
|
||||||
|
|
||||||
if (s ~ "^" QUOTE) {
|
|
||||||
old = substr(old, 2)
|
|
||||||
|
|
||||||
# Find matching quote
|
|
||||||
if (match(s, QUOTE)) {
|
|
||||||
old = substr(old, 1, RSTART)
|
|
||||||
# s = substr()
|
|
||||||
if (match(s, "^" WHITESPACE "*"))
|
|
||||||
s = substr(s, RLENGTH)
|
|
||||||
return old
|
|
||||||
} else {
|
|
||||||
# no matching quote
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (match(s, "^" WHITESPACE "+")) {
|
|
||||||
sub("^" WHITESPACE "+", "", s)
|
|
||||||
if (split_equals)
|
|
||||||
sub(EQUALS WHITESPACE "*", "", s)
|
|
||||||
} else if (s ~ "^" EQUALS) {
|
|
||||||
s = substr(s, 2)
|
|
||||||
}
|
|
||||||
|
|
||||||
return old SUBSEP s
|
|
||||||
}
|
|
||||||
function strdelim(s) { return strdelim_internal(s, 1) }
|
|
||||||
function strdelimw(s) { return strdelim_internal(s, 0) }
|
|
||||||
|
|
||||||
function singleton_option(opt) {
|
|
||||||
return tolower(opt) !~ /^(acceptenv|allowgroups|allowusers|authenticationmethods|authorizedkeysfile|denygroups|denyusers|hostcertificate|hostkey|listenaddress|logverbose|permitlisten|permitopen|port|setenv|subsystem)$/
|
|
||||||
}
|
|
||||||
|
|
||||||
function print_update() {
|
|
||||||
if (mode) {
|
|
||||||
if (match_only) printf "\t"
|
|
||||||
printf "%s\n", line_should
|
|
||||||
updated = 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
BEGIN {
|
|
||||||
FS = "\n" # disable field splitting
|
|
||||||
|
|
||||||
WHITESPACE = "[ \t]" # servconf.c, misc.c:strdelim_internal (without line breaks, cf. bugs)
|
|
||||||
QUOTE = "[\"]" # misc.c:strdelim_internal
|
|
||||||
EQUALS = "[=]"
|
|
||||||
|
|
||||||
split("", opts)
|
|
||||||
split("", files)
|
|
||||||
getopt("ho:l:m:", ARGV, opts, files)
|
|
||||||
|
|
||||||
if (opts["h"]) { usage(); exit (e="0") }
|
|
||||||
|
|
||||||
line_should = opts["l"]
|
|
||||||
match_only = opts["m"]
|
|
||||||
num_files = alength(files)
|
|
||||||
|
|
||||||
if (num_files != 1 || !opts["o"] || !line_should) {
|
|
||||||
usage()
|
|
||||||
exit (e=126)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (opts["o"] == "set") {
|
|
||||||
mode = 1
|
|
||||||
} else if (opts["o"] == "unset") {
|
|
||||||
mode = 0
|
|
||||||
} else {
|
|
||||||
print_err(sprintf("invalid mode %s\n", mode))
|
|
||||||
exit (e=1)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mode) {
|
|
||||||
# loop over sshd_config twice!
|
|
||||||
ARGV[2] = ARGV[1] = files[1]
|
|
||||||
ARGC = 3
|
|
||||||
} else {
|
|
||||||
# only loop once
|
|
||||||
ARGV[1] = files[1]
|
|
||||||
ARGC = 2
|
|
||||||
}
|
|
||||||
|
|
||||||
split(strdelim(line_should), should, SUBSEP)
|
|
||||||
option_should = tolower(should[1])
|
|
||||||
value_should = should[2]
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
line = $0
|
|
||||||
|
|
||||||
# Strip trailing whitespace. Allow \f (form feed) at EOL only
|
|
||||||
sub("(" WHITESPACE "|\f)*$", "", line)
|
|
||||||
|
|
||||||
# Strip leading whitespace
|
|
||||||
sub("^" WHITESPACE "*", "", line)
|
|
||||||
|
|
||||||
if (match(line, "^#" WHITESPACE "*")) {
|
|
||||||
prefix = substr(line, RSTART, RLENGTH)
|
|
||||||
line = substr(line, RSTART + RLENGTH)
|
|
||||||
} else {
|
|
||||||
prefix = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
line_type = "invalid"
|
|
||||||
option_is = value_is = ""
|
|
||||||
|
|
||||||
if (line) {
|
|
||||||
split(strdelim(line), toks, SUBSEP)
|
|
||||||
|
|
||||||
if (tolower(toks[1]) == "match") {
|
|
||||||
MATCH = (prefix ~ /^#/ ? "#" : "") join(" ", toks, 2)
|
|
||||||
line_type = "match"
|
|
||||||
} else if (toks[1] ~ /^[A-Za-z][A-Za-z0-9]+$/) {
|
|
||||||
# This could be an option line
|
|
||||||
line_type = "option"
|
|
||||||
option_is = tolower(toks[1])
|
|
||||||
value_is = toks[2]
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
line_type = "empty"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# mode: unset
|
|
||||||
|
|
||||||
!mode {
|
|
||||||
# delete matching config
|
|
||||||
if (prefix !~ /^#/)
|
|
||||||
if (MATCH == match_only && option_is == option_should)
|
|
||||||
if (!value_should || value_should == value_is)
|
|
||||||
next
|
|
||||||
|
|
||||||
print
|
|
||||||
next
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# mode: set
|
|
||||||
|
|
||||||
mode && NR == FNR {
|
|
||||||
if (line_type == "option") {
|
|
||||||
if (MATCH !~ /^#/) {
|
|
||||||
if (prefix ~ /^#/) {
|
|
||||||
# comment line
|
|
||||||
last_occ[MATCH, "#" option_is] = FNR
|
|
||||||
} else {
|
|
||||||
# option line
|
|
||||||
last_occ[MATCH, option_is] = FNR
|
|
||||||
}
|
|
||||||
last_occ[MATCH] = FNR
|
|
||||||
}
|
|
||||||
} else if (line_type == "invalid" && !prefix) {
|
|
||||||
# INVALID LINE
|
|
||||||
print_err(sprintf("%s: syntax error on line %u\n", ARGV[0], FNR))
|
|
||||||
}
|
|
||||||
|
|
||||||
next
|
|
||||||
}
|
|
||||||
|
|
||||||
# before second pass prepare hashes containing location information to be used
|
|
||||||
# in the second pass.
|
|
||||||
mode && NR > FNR && FNR == 1 {
|
|
||||||
# First we drop the locations of commented-out options if a non-commented
|
|
||||||
# option is available. If a non-commented option is available, we will
|
|
||||||
# append new config options there to have them all at one place.
|
|
||||||
for (k in last_occ) {
|
|
||||||
if (k ~ /^#/) {
|
|
||||||
# delete entries of commented out match blocks
|
|
||||||
delete last_occ[k]
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
split(k, parts, SUBSEP)
|
|
||||||
|
|
||||||
if (parts[2] ~ /^#/ && ((parts[1], substr(parts[2], 2)) in last_occ))
|
|
||||||
delete last_occ[k]
|
|
||||||
}
|
|
||||||
|
|
||||||
# Reverse the option => line mapping. The line_map allows for easier lookups
|
|
||||||
# in the second pass.
|
|
||||||
# We only keep options, not top-level keywords, because we can only have
|
|
||||||
# one entry per line and there are conflicts with last lines of "sections".
|
|
||||||
for (k in last_occ) {
|
|
||||||
if (!index(k, SUBSEP)) continue
|
|
||||||
line_map[last_occ[k]] = k
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Second pass
|
|
||||||
mode && line_map[FNR] == match_only SUBSEP option_should && !updated {
|
|
||||||
split(line_map[FNR], parts, SUBSEP)
|
|
||||||
|
|
||||||
# If option allows multiple values, print current value
|
|
||||||
if (!singleton_option(parts[2])) {
|
|
||||||
if (value_should != value_is)
|
|
||||||
print
|
|
||||||
}
|
|
||||||
|
|
||||||
print_update()
|
|
||||||
|
|
||||||
next
|
|
||||||
}
|
|
||||||
|
|
||||||
mode { print }
|
|
||||||
|
|
||||||
# Is a comment option
|
|
||||||
mode && line_map[FNR] == match_only SUBSEP "#" option_should && !updated {
|
|
||||||
print_update()
|
|
||||||
}
|
|
||||||
|
|
||||||
# Last line of the should match section
|
|
||||||
mode && last_occ[match_only] == FNR && !updated {
|
|
||||||
# NOTE: Inserting empty lines is only cosmetic. It is only done if
|
|
||||||
# different options are next to each other and not in a match block
|
|
||||||
# (match blocks are usually not in the default config and thus don’t
|
|
||||||
# contain commented blocks.)
|
|
||||||
if (line && option_is != option_should && !MATCH)
|
|
||||||
print ""
|
|
||||||
print_update()
|
|
||||||
}
|
|
||||||
|
|
||||||
END {
|
|
||||||
if (e) exit e
|
|
||||||
|
|
||||||
if (mode && !updated) {
|
|
||||||
if (match_only && MATCH != match_only) {
|
|
||||||
printf "\nMatch %s\n", match_only
|
|
||||||
}
|
|
||||||
|
|
||||||
print_update()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,97 +0,0 @@
|
||||||
#!/bin/sh -e
|
|
||||||
#
|
|
||||||
# 2020 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/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
joinlines() { sed -n -e H -e "\${x;s/^\\n//;s/\\n/${1:?}/g;p;}"; }
|
|
||||||
|
|
||||||
state_is=$(cat "${__object:?}/explorer/state")
|
|
||||||
state_should=$(cat "${__object:?}/parameter/state")
|
|
||||||
|
|
||||||
if test "${state_is}" = "${state_should}" -o "${state_is}" = 'default'
|
|
||||||
then
|
|
||||||
# nothing to do (if the value is the default, ignore its state)
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
case ${state_should}
|
|
||||||
in
|
|
||||||
(present)
|
|
||||||
mode='set'
|
|
||||||
;;
|
|
||||||
(absent)
|
|
||||||
mode='unset'
|
|
||||||
;;
|
|
||||||
(*)
|
|
||||||
printf 'Invalid --state: %s\n' "${state_should}" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
sshd_config_file=$(cat "${__object:?}/parameter/file")
|
|
||||||
|
|
||||||
quote() { printf "'%s'" "$(printf '%s' "$*" | sed -e "s/'/'\\\\''/g")"; }
|
|
||||||
drop_awk_comments() { quote "$(sed '/^[[:blank:]]*#.*$/d;/^$/d' "$@")"; }
|
|
||||||
|
|
||||||
# Ensure the sshd_config file is there
|
|
||||||
cat <<EOF
|
|
||||||
test -e $(quote "${sshd_config_file}") || {
|
|
||||||
: >$(quote "${sshd_config_file}")
|
|
||||||
chown 0:0 $(quote "${sshd_config_file}")
|
|
||||||
chmod 0644 $(quote "${sshd_config_file}")
|
|
||||||
}
|
|
||||||
|
|
||||||
EOF
|
|
||||||
|
|
||||||
match_only=
|
|
||||||
if test -s "${__object:?}/parameter/match"
|
|
||||||
then
|
|
||||||
match_only=$(joinlines ' ' <"${__object:?}/parameter/match")
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -s "${__object:?}/parameter/option"
|
|
||||||
then
|
|
||||||
option_line=$(cat "${__object:?}/parameter/option")
|
|
||||||
else
|
|
||||||
option_line=${__object_id:?}
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -s "${__object:?}/parameter/value"
|
|
||||||
then
|
|
||||||
option_line="${option_line} $(cat "${__object:?}/parameter/value")"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Send message on config update
|
|
||||||
printf '%s%s %s\n' "${mode}" "${match_only:+ [${match_only}]}" \
|
|
||||||
"${option_line}" >>"${__messages_out:?}"
|
|
||||||
|
|
||||||
# Update sshd_config (remote code)
|
|
||||||
cat <<EOF
|
|
||||||
awk $(drop_awk_comments "${__type:?}/files/update_sshd_config.awk") \\
|
|
||||||
-o ${mode} \\
|
|
||||||
-m $(quote "${match_only}") \\
|
|
||||||
-l $(quote "${option_line}") \\
|
|
||||||
$(quote "${sshd_config_file}") >$(quote "${sshd_config_file}.tmp") \\
|
|
||||||
|| exit
|
|
||||||
|
|
||||||
cmp -s $(quote "${sshd_config_file}") $(quote "${sshd_config_file}.tmp") || {
|
|
||||||
sshd -t -f $(quote "${sshd_config_file}.tmp") \\
|
|
||||||
&& cat $(quote "${sshd_config_file}.tmp") >$(quote "${sshd_config_file}")
|
|
||||||
}
|
|
||||||
rm -f $(quote "${sshd_config_file}.tmp")
|
|
||||||
EOF
|
|
||||||
|
|
@ -1,94 +0,0 @@
|
||||||
cdist-type__sshd_config(7)
|
|
||||||
==========================
|
|
||||||
|
|
||||||
NAME
|
|
||||||
----
|
|
||||||
cdist-type__sshd_config - Manage options in sshd_config
|
|
||||||
|
|
||||||
|
|
||||||
DESCRIPTION
|
|
||||||
-----------
|
|
||||||
This space intentionally left blank.
|
|
||||||
|
|
||||||
|
|
||||||
REQUIRED PARAMETERS
|
|
||||||
-------------------
|
|
||||||
None.
|
|
||||||
|
|
||||||
|
|
||||||
OPTIONAL PARAMETERS
|
|
||||||
-------------------
|
|
||||||
file
|
|
||||||
The path to the sshd_config file to edit.
|
|
||||||
Defaults to ``/etc/ssh/sshd_config``.
|
|
||||||
match
|
|
||||||
Restrict this option to apply only for certain connections.
|
|
||||||
Allowed values are what would be allowed to be written after a ``Match``
|
|
||||||
keyword in ``sshd_config``, e.g. ``--match 'User anoncvs'``.
|
|
||||||
|
|
||||||
Can be used multiple times. All of the values are ANDed together.
|
|
||||||
option
|
|
||||||
The name of the option to manipulate. Defaults to ``__object_id``.
|
|
||||||
state
|
|
||||||
Can be:
|
|
||||||
|
|
||||||
- ``present``: ensure a matching config line is present (or the default
|
|
||||||
value).
|
|
||||||
- ``absent``: ensure no matching config line is present.
|
|
||||||
value
|
|
||||||
The option's value to be assigned to the option (if ``--state present``) or
|
|
||||||
removed (if ``--state absent``).
|
|
||||||
|
|
||||||
This option is required if ``--state present``. If not specified and
|
|
||||||
``--state absent``, all values for the given option are removed.
|
|
||||||
|
|
||||||
|
|
||||||
BOOLEAN PARAMETERS
|
|
||||||
------------------
|
|
||||||
None.
|
|
||||||
|
|
||||||
|
|
||||||
EXAMPLES
|
|
||||||
--------
|
|
||||||
|
|
||||||
.. code-block:: sh
|
|
||||||
|
|
||||||
# Disallow root logins with password
|
|
||||||
__sshd_config PermitRootLogin --value without-password
|
|
||||||
|
|
||||||
# Disallow password-based authentication
|
|
||||||
__sshd_config PasswordAuthentication --value no
|
|
||||||
|
|
||||||
# Accept the EDITOR environment variable
|
|
||||||
__sshd_config AcceptEnv:EDITOR --option AcceptEnv --value EDITOR
|
|
||||||
|
|
||||||
# Force command for connections as git user
|
|
||||||
__sshd_config git@ForceCommand --match 'User git' --option ForceCommand \
|
|
||||||
--value 'cd ~git && exec git-shell ${SSH_ORIGINAL_COMMAND:+-c "${SSH_ORIGINAL_COMMAND}"}'
|
|
||||||
|
|
||||||
|
|
||||||
SEE ALSO
|
|
||||||
--------
|
|
||||||
:strong:`sshd_config`\ (5)
|
|
||||||
|
|
||||||
|
|
||||||
BUGS
|
|
||||||
----
|
|
||||||
- This type assumes a nicely formatted config file,
|
|
||||||
i.e. no config options spanning multiple lines.
|
|
||||||
- ``Include`` directives are ignored.
|
|
||||||
- Config options are not added/removed to/from the config file if their value is
|
|
||||||
the default value.
|
|
||||||
|
|
||||||
|
|
||||||
AUTHORS
|
|
||||||
-------
|
|
||||||
Dennis Camera <dennis.camera--@--ssrq-sds-fds.ch>
|
|
||||||
|
|
||||||
|
|
||||||
COPYING
|
|
||||||
-------
|
|
||||||
Copyright \(C) 2020 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,48 +0,0 @@
|
||||||
#!/bin/sh -e
|
|
||||||
#
|
|
||||||
# 2020 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/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
os=$(cat "${__global:?}/explorer/os")
|
|
||||||
|
|
||||||
state_should=$(cat "${__object:?}/parameter/state")
|
|
||||||
|
|
||||||
case ${os}
|
|
||||||
in
|
|
||||||
(alpine|centos|fedora|redhat|scientific|debian|devuan|ubuntu)
|
|
||||||
if test "${state_should}" != 'absent'
|
|
||||||
then
|
|
||||||
__package openssh-server --state present
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
(archlinux|gentoo|slackware|suse)
|
|
||||||
if test "${state_should}" != 'absent'
|
|
||||||
then
|
|
||||||
__package openssh --state present
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
(freebsd|netbsd|openbsd)
|
|
||||||
# whitelist
|
|
||||||
;;
|
|
||||||
(*)
|
|
||||||
printf 'Your operating system (%s) is currently not supported by this type (%s)\n' \
|
|
||||||
"${os}" "${__type##*/}" >&2
|
|
||||||
printf 'Please contribute an implementation for it if you can.\n' >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
/etc/ssh/sshd_config
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
present
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
file
|
|
||||||
option
|
|
||||||
state
|
|
||||||
value
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
match
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|
||||||
import importlib
|
import imp
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import unittest
|
import unittest
|
||||||
|
|
@ -37,9 +37,8 @@ for possible_test in os.listdir(base_dir):
|
||||||
|
|
||||||
suites = []
|
suites = []
|
||||||
for test_module in test_modules:
|
for test_module in test_modules:
|
||||||
module_spec = importlib.util.find_spec("cdist.test.{}".format(test_module))
|
module_parameters = imp.find_module(test_module, [base_dir])
|
||||||
module = importlib.util.module_from_spec(module_spec)
|
module = imp.load_module("cdist.test." + test_module, *module_parameters)
|
||||||
module_spec.loader.exec_module(module)
|
|
||||||
|
|
||||||
suite = unittest.defaultTestLoader.loadTestsFromModule(module)
|
suite = unittest.defaultTestLoader.loadTestsFromModule(module)
|
||||||
# print("Got suite: " + suite.__str__())
|
# print("Got suite: " + suite.__str__())
|
||||||
|
|
|
||||||
|
|
@ -1,27 +1,11 @@
|
||||||
Changelog
|
Changelog
|
||||||
---------
|
---------
|
||||||
|
|
||||||
6.9.4: 2020-12-21
|
next:
|
||||||
* Type __package_pkgng_freebsd: Fix bootstrapping pkg (Dennis Camera)
|
|
||||||
* Core: Deal with deprecated imp in unit tests (Evil Ham)
|
|
||||||
* Type __iptables: Add IPv6 support (Matthias Stecher)
|
|
||||||
* Type __block: Fix escaping in here-doc (Matthias Stecher)
|
|
||||||
* Explorer os_version: Improve FreeBSD support (Evil Ham)
|
|
||||||
* New type: __apt_backports (Matthias Stecher)
|
|
||||||
* Type __dot_file: Add dirmode parameter (Mark Verboom)
|
|
||||||
|
|
||||||
6.9.3: 2020-12-04
|
|
||||||
* pip install: Add cdist.scan to packages in setup.py (Dennis Camera)
|
|
||||||
|
|
||||||
6.9.2: 2020-11-20
|
|
||||||
* Documentation: Fix examples in best practice (Dennis Camera)
|
* Documentation: Fix examples in best practice (Dennis Camera)
|
||||||
* Type __locale: Add state explorer (Matthias Stecher)
|
* Type __locale: Add state explorer (Matthias Stecher)
|
||||||
* Core: Reorganize scripts, version generation (Ander Punnar, Dennis Camera)
|
* Core: Reorganize scripts, version generation (Ander Punnar, Dennis Camera)
|
||||||
* New type: __hwclock (Dennis Camera)
|
* New type: __hwclock (Dennis Camera)
|
||||||
* Type __hostname: Fix guessing SuSE OS version (Dennis Camera)
|
|
||||||
* New type: __sshd_config (Dennis Camera)
|
|
||||||
* New type: __localedef (Dennis Camera)
|
|
||||||
* Type __locale: Deprecate in favor of __localedef (Dennis Camera)
|
|
||||||
|
|
||||||
6.9.1: 2020-11-08
|
6.9.1: 2020-11-08
|
||||||
* Type __file: Fix state pre-exists (Dennis Camera)
|
* Type __file: Fix state pre-exists (Dennis Camera)
|
||||||
|
|
|
||||||
2
setup.py
2
setup.py
|
|
@ -54,7 +54,7 @@ os.chdir(cur)
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name="cdist",
|
name="cdist",
|
||||||
packages=["cdist", "cdist.core", "cdist.exec", "cdist.scan", "cdist.util"],
|
packages=["cdist", "cdist.core", "cdist.exec", "cdist.util", ],
|
||||||
package_data={'cdist': package_data},
|
package_data={'cdist': package_data},
|
||||||
scripts=["bin/cdist", "bin/cdist-dump", "bin/cdist-new-type"],
|
scripts=["bin/cdist", "bin/cdist-dump", "bin/cdist-new-type"],
|
||||||
version=cdist.version.VERSION,
|
version=cdist.version.VERSION,
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue