Compare commits

..

12 commits

Author SHA1 Message Date
Darko Poljak
ecc1dccd03 quoting; posix sed; 2018-09-30 14:45:47 +02:00
Darko Poljak
9e0cfd5df5 Fix vim typo. 2018-09-30 14:45:47 +02:00
Darko Poljak
4bec22d726 Revert changes in for loop because param value is changed. 2018-09-30 14:45:47 +02:00
Darko Poljak
33a0e05e3d Revert changes in for loop because param value is changed. 2018-09-30 14:45:47 +02:00
Darko Poljak
1388487199 Clean quotes; su - -> su -l 2018-09-30 14:45:47 +02:00
Darko Poljak
62f1e1db00 Applying uqam-fob's suggestions. 2018-09-30 14:43:39 +02:00
Darko Poljak
b55520e987 Applying uqam-fob's suggestions. 2018-09-30 14:43:39 +02:00
Darko Poljak
775d3dfc2c shellcheck fixes 2018-09-30 14:43:07 +02:00
Darko Poljak
309315910e Add shellcheck makefile target. 2018-09-30 14:42:38 +02:00
Darko Poljak
6d0e1a2e73 --tmpdir -> TMPDIR env var 2018-09-30 14:42:38 +02:00
Darko Poljak
3759a37fbd Fix tr reading from file. 2018-09-30 14:42:38 +02:00
Darko Poljak
b371c42d53 shellcheck 2018-09-30 14:42:37 +02:00
305 changed files with 2274 additions and 4231 deletions

2
.gitattributes vendored
View file

@ -4,5 +4,3 @@
docs/speeches export-ignore docs/speeches export-ignore
docs/video export-ignore docs/video export-ignore
docs/src/man7 export-ignore docs/src/man7 export-ignore
bin/build-helper export-ignore
README-maintainers export-ignore

20
.gitignore vendored
View file

@ -1,22 +1,5 @@
# -vim # -vim
# Swap .*.swp
[._]*.s[a-v][a-z]
[._]*.sw[a-p]
[._]s[a-rt-v][a-z]
[._]ss[a-gi-z]
[._]sw[a-p]
# Session
Session.vim
# Temporary
.netrwhist
*~
*.tmp
# Auto-generated tag files
tags
# Persistent undo
[._]*.un~
# Ignore generated manpages # Ignore generated manpages
docs/src/.marker docs/src/.marker
@ -44,7 +27,6 @@ _build/
docs/dist docs/dist
# Ignore temp files used for signing # Ignore temp files used for signing
cdist-*.tar
cdist-*.tar.gz cdist-*.tar.gz
cdist-*.tar.gz.asc cdist-*.tar.gz.asc

206
Makefile
View file

@ -18,30 +18,33 @@
# #
# #
.PHONY: help helper=./bin/build-helper
help:
@echo "Please use \`make <target>' where <target> is one of"
@echo "man build only man user documentation"
@echo "html build only html user documentation"
@echo "docs build both man and html user documentation"
@echo "dotman build man pages for types in your ~/.cdist directory"
@echo "speeches build speeches pdf files"
@echo "install install in the system site-packages directory"
@echo "install-user install in the user site-packages directory"
@echo "docs-clean clean documentation"
@echo "clean clean"
DOCS_SRC_DIR=./docs/src DOCS_SRC_DIR=docs/src
SPEECHDIR=./docs/speeches SPEECHDIR=docs/speeches
TYPEDIR=./cdist/conf/type TYPEDIR=cdist/conf/type
WEBSRCDIR=docs/web
WEBDIR=$$HOME/vcs/www.nico.schottelius.org
WEBBLOG=$(WEBDIR)/blog
WEBBASE=$(WEBDIR)/software/cdist
WEBPAGE=$(WEBBASE).mdwn
CHANGELOG_VERSION=$(shell $(helper) changelog-version)
CHANGELOG_FILE=docs/changelog
PYTHON_VERSION=cdist/version.py
SPHINXM=make -C $(DOCS_SRC_DIR) man SPHINXM=make -C $(DOCS_SRC_DIR) man
SPHINXH=make -C $(DOCS_SRC_DIR) html SPHINXH=make -C $(DOCS_SRC_DIR) html
SPHINXC=make -C $(DOCS_SRC_DIR) clean SPHINXC=make -C $(DOCS_SRC_DIR) clean
SHELLCHECKCMD=shellcheck -s sh -f gcc -x -e SC2154,SC1091
################################################################################ ################################################################################
# Manpages # Manpages
# #
MAN1DSTDIR=$(DOCS_SRC_DIR)/man1
MAN7DSTDIR=$(DOCS_SRC_DIR)/man7 MAN7DSTDIR=$(DOCS_SRC_DIR)/man7
# Manpages #1: Types # Manpages #1: Types
@ -63,16 +66,11 @@ DOCSREFSH=$(DOCS_SRC_DIR)/cdist-reference.rst.sh
$(DOCSREF): $(DOCSREFSH) $(DOCSREF): $(DOCSREFSH)
$(DOCSREFSH) $(DOCSREFSH)
version:
@[ -f "cdist/version.py" ] || { \
printf "Missing 'cdist/version.py', please generate it first.\n" && exit 1; \
}
# Manpages #3: generic part # Manpages #3: generic part
man: version $(MANTYPES) $(DOCSREF) man: $(MANTYPES) $(DOCSREF) $(PYTHON_VERSION)
$(SPHINXM) $(SPHINXM)
html: version $(MANTYPES) $(DOCSREF) html: $(MANTYPES) $(DOCSREF) $(PYTHON_VERSION)
$(SPHINXH) $(SPHINXH)
docs: man html docs: man html
@ -80,6 +78,24 @@ docs: man html
docs-clean: docs-clean:
$(SPHINXC) $(SPHINXC)
# Manpages #5: release part
MANWEBDIR=$(WEBBASE)/man/$(CHANGELOG_VERSION)
HTMLBUILDDIR=docs/dist/html
docs-dist: html
rm -rf "${MANWEBDIR}"
mkdir -p "${MANWEBDIR}"
# mkdir -p "${MANWEBDIR}/man1" "${MANWEBDIR}/man7"
# cp ${MAN1DSTDIR}/*.html ${MAN1DSTDIR}/*.css ${MANWEBDIR}/man1
# cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${MANWEBDIR}/man7
cp -R ${HTMLBUILDDIR}/* ${MANWEBDIR}
cd ${MANWEBDIR} && git add . && git commit -m "cdist manpages update: $(CHANGELOG_VERSION)" || true
man-latest-link: web-pub
# Fix ikiwiki, which does not like symlinks for pseudo security
ssh staticweb.ungleich.ch \
"cd /home/services/www/nico/nico.schottelius.org/www/software/cdist/man/ && rm -f latest && ln -sf "$(CHANGELOG_VERSION)" latest"
# Manpages: .cdist Types # Manpages: .cdist Types
DOT_CDIST_PATH=${HOME}/.cdist DOT_CDIST_PATH=${HOME}/.cdist
DOTMAN7DSTDIR=$(MAN7DSTDIR) DOTMAN7DSTDIR=$(MAN7DSTDIR)
@ -92,7 +108,8 @@ DOTMANTYPES=$(subst /man.rst,.rst,$(DOTMANTYPEPREFIX))
$(DOTMAN7DSTDIR)/cdist-type%.rst: $(DOTTYPEDIR)/%/man.rst $(DOTMAN7DSTDIR)/cdist-type%.rst: $(DOTTYPEDIR)/%/man.rst
ln -sf "$^" $@ ln -sf "$^" $@
dotman: version $(DOTMANTYPES) # Manpages #3: generic part
dotman: $(DOTMANTYPES)
$(SPHINXM) $(SPHINXM)
################################################################################ ################################################################################
@ -100,6 +117,7 @@ dotman: version $(DOTMANTYPES)
# #
SPEECHESOURCES=$(SPEECHDIR)/*.tex SPEECHESOURCES=$(SPEECHDIR)/*.tex
SPEECHES=$(SPEECHESOURCES:.tex=.pdf) SPEECHES=$(SPEECHESOURCES:.tex=.pdf)
SPEECHESWEBDIR=$(WEBBASE)/speeches
# Create speeches and ensure Toc is up-to-date # Create speeches and ensure Toc is up-to-date
$(SPEECHDIR)/%.pdf: $(SPEECHDIR)/%.tex $(SPEECHDIR)/%.pdf: $(SPEECHDIR)/%.tex
@ -109,26 +127,150 @@ $(SPEECHDIR)/%.pdf: $(SPEECHDIR)/%.tex
speeches: $(SPEECHES) speeches: $(SPEECHES)
speeches-dist: speeches
rm -rf "${SPEECHESWEBDIR}"
mkdir -p "${SPEECHESWEBDIR}"
cp ${SPEECHES} "${SPEECHESWEBDIR}"
cd ${SPEECHESWEBDIR} && git add . && git commit -m "cdist speeches updated" || true
################################################################################ ################################################################################
# Misc # Website
# #
clean: docs-clean
BLOGFILE=$(WEBBLOG)/cdist-$(CHANGELOG_VERSION)-released.mdwn
$(BLOGFILE): $(CHANGELOG_FILE)
$(helper) blog $(CHANGELOG_VERSION) $(BLOGFILE)
web-blog: $(BLOGFILE)
web-doc:
# Go to top level, because of cdist.mdwn
rsync -av "$(WEBSRCDIR)/" "${WEBBASE}/.."
cd "${WEBBASE}/.." && git add cdist* && git commit -m "cdist doc update" cdist* || true
web-dist: web-blog web-doc
web-pub: web-dist docs-dist speeches-dist
cd "${WEBDIR}" && make pub
web-release-all: man-latest-link
web-release-all-no-latest: web-pub
################################################################################
# Release: Mailinglist
#
ML_FILE=.lock-ml
# Only send mail once - lock until new changelog things happened
$(ML_FILE): $(CHANGELOG_FILE)
$(helper) ml-release $(CHANGELOG_VERSION)
touch $@
ml-release: $(ML_FILE)
################################################################################
# pypi
#
PYPI_FILE=.pypi-release
$(PYPI_FILE): man $(PYTHON_VERSION)
python3 setup.py sdist upload
touch $@
pypi-release: $(PYPI_FILE)
################################################################################
# archlinux
#
ARCHLINUX_FILE=.lock-archlinux
ARCHLINUXTAR=cdist-$(CHANGELOG_VERSION)-1.src.tar.gz
$(ARCHLINUXTAR): PKGBUILD
umask 022; mkaurball
PKGBUILD: PKGBUILD.in $(PYTHON_VERSION)
./PKGBUILD.in $(CHANGELOG_VERSION)
$(ARCHLINUX_FILE): $(ARCHLINUXTAR) $(PYTHON_VERSION)
burp -c system $(ARCHLINUXTAR)
touch $@
archlinux-release: $(ARCHLINUX_FILE)
################################################################################
# Release
#
$(PYTHON_VERSION) version: .git/refs/heads/master
$(helper) version
# Code that is better handled in a shell script
check-%:
$(helper) $@
release:
$(helper) $@
################################################################################
# Cleanup
#
clean:
rm -f $(DOCS_SRC_DIR)/cdist-reference.rst rm -f $(DOCS_SRC_DIR)/cdist-reference.rst
find "$(DOCS_SRC_DIR)" -mindepth 2 -type l \ find "$(DOCS_SRC_DIR)" -mindepth 2 -type l \
| xargs rm -f | xargs rm -f
make -C $(DOCS_SRC_DIR) clean
find * -name __pycache__ | xargs rm -rf find * -name __pycache__ | xargs rm -rf
# distutils # Archlinux
rm -rf ./build rm -f cdist-*.pkg.tar.xz cdist-*.tar.gz
rm -rf pkg/ src/
rm -f MANIFEST PKGBUILD
rm -rf dist/
# Signed release
rm -f cdist-*.tar.gz
rm -f cdist-*.tar.gz.asc
distclean: clean
rm -f cdist/version.py
################################################################################ ################################################################################
# install # Misc
# #
install: # The pub is Nico's "push to all git remotes" way ("make pub")
python3 setup.py install pub:
git push --mirror
test:
$(helper) $@
test-remote:
$(helper) $@
pep8:
$(helper) $@
shellcheck-global-explorers:
@find cdist/conf/explorer -type f -exec $(SHELLCHECKCMD) {} + || exit 0
shellcheck-manifests:
@find cdist/conf/type -type f -name manifest -exec $(SHELLCHECKCMD) {} + || exit 0
shellcheck-local-gencodes:
@find cdist/conf/type -type f -name gencode-local -exec $(SHELLCHECKCMD) {} + || exit 0
shellcheck-remote-gencodes:
@find cdist/conf/type -type f -name gencode-remote -exec $(SHELLCHECKCMD) {} + || exit 0
shellcheck-gencodes: shellcheck-local-gencodes shellcheck-remote-gencodes
shellcheck-types: shellcheck-manifests shellcheck-gencodes
shellcheck: shellcheck-global-explorers shellcheck-types
install-user:
python3 setup.py install --user

View file

@ -9,7 +9,7 @@ pkgver=$version
pkgrel=1 pkgrel=1
pkgdesc='A Usable Configuration Management System"' pkgdesc='A Usable Configuration Management System"'
arch=('any') arch=('any')
url='https://www.cdi.st/' url='http://www.nico.schottelius.org/software/cdist/'
license=('GPL3') license=('GPL3')
depends=('python>=3.2.0') depends=('python>=3.2.0')
source=("http://pypi.python.org/packages/source/c/cdist/cdist-\${pkgver}.tar.gz") source=("http://pypi.python.org/packages/source/c/cdist/cdist-\${pkgver}.tar.gz")

3
README
View file

@ -3,5 +3,4 @@ cdist
cdist is a usable configuration management system. cdist is a usable configuration management system.
For the web documentation have a look at https://www.cdi.st/ For the web documentation have a look at docs/web/.
or at docs/src for reStructuredText manual.

View file

@ -1,4 +0,0 @@
Maintainers should use ./bin/build-helper script.
Makefile is intended for end users. It can be used for non-maintaining
targets that can be run from pure source (without git repository).

View file

@ -1,7 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# 2011-2013 Nico Schottelius (nico-cdist at schottelius.org) # 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
# 2016-2019 Darko Poljak (darko.poljak at gmail.com)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -19,66 +18,17 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
# #
# This file contains the heavy lifting found usually in the Makefile. # This file contains the heavy lifting found usually in the Makefile
# #
usage() { basedir=${0%/*}/../
printf "usage: %s TARGET [TARGET-ARGS...] # Change to checkout directory
Available targets: cd "$basedir"
changelog-changes
changelog-version
check-date
check-unittest
ml-release
archlinux-release
pypi-release
release-git-tag
sign-git-release
release
test
test-remote
pycodestyle
pep8
check-pycodestyle
shellcheck-global-explorers
shellcheck-type-explorers
shellcheck-manifests
shellcheck-local-gencodes
shellcheck-remote-gencodes
shellcheck-scripts
shellcheck-gencodes
shellcheck-types
shellcheck
shellcheck-type-files
shellcheck-with-files
shellcheck-build-helper
check-shellcheck
version-branch
version
target-version
clean
distclean\n" "$1"
}
basename="${0##*/}" version=$(git describe)
if [ $# -lt 1 ]
then
usage "${basename}"
exit 1
fi
option=$1; shift option=$1; shift
SHELLCHECKCMD="shellcheck -s sh -f gcc -x"
# Skip SC2154 for variables starting with __ since such variables are cdist
# environment variables.
SHELLCHECK_SKIP=': __.*is referenced but not assigned.*\[SC2154\]'
# Change to checkout directory
basedir="${0%/*}/../"
cd "$basedir"
case "$option" in case "$option" in
changelog-changes) changelog-changes)
if [ "$#" -eq 1 ]; then if [ "$#" -eq 1 ]; then
@ -116,8 +66,8 @@ case "$option" in
date_changelog=$(grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/.*: //') date_changelog=$(grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/.*: //')
if [ "$date_today" != "$date_changelog" ]; then if [ "$date_today" != "$date_changelog" ]; then
printf "Date in changelog is not today\n" echo "Date in changelog is not today"
printf "Changelog date: %s\n" "${date_changelog}" echo "Changelog: $date_changelog"
exit 1 exit 1
fi fi
;; ;;
@ -126,17 +76,54 @@ case "$option" in
"$0" test "$0" test
;; ;;
blog)
version=$1; shift
blogfile=$1; shift
dir=${blogfile%/*}
file=${blogfile##*/}
cat << eof > "$blogfile"
[[!meta title="Cdist $version released"]]
Here's a short overview about the changes found in version ${version}:
eof
$0 changelog-changes "$version" >> "$blogfile"
cat << eof >> "$blogfile"
For more information visit the [[cdist homepage|software/cdist]].
[[!tag cdist config unix]]
eof
cd "$dir"
git add "$file"
# Allow git commit to fail if there are no changes
git commit -m "cdist blog update: $version" "$blogfile" || true
;;
ml-release) ml-release)
if [ $# -ne 1 ]; then if [ $# -ne 1 ]; then
printf "%s ml-release version\n" "$0" >&2 echo "$0 ml-release version" >&2
exit 1 exit 1
fi fi
version=$1; shift version=$1; shift
to_a=cdist
to_d=l.schottelius.org
to=${to_a}@${to_d}
from_a=nico-cdist
from_d=schottelius.org
from=${from_a}@${from_d}
( (
cat << eof cat << eof
Subject: cdist $version has been released From: Nico -telmich- Schottelius <$from>
To: cdist mailing list <$to>
Subject: cdist $version released
Hello .*, Hello .*,
@ -147,41 +134,25 @@ eof
"$0" changelog-changes "$version" "$0" changelog-changes "$version"
cat << eof cat << eof
Cheers,
Nico
--
Automatisation at its best level. With cdist.
eof eof
) > mailinglist.tmp ) | /usr/sbin/sendmail -f "$from" "$to"
;; ;;
archlinux-release)
if [ $# -ne 1 ]; then
printf "%s archlinux-release version\n" "$0" >&2
exit 1
fi
version=$1; shift
ARCHLINUXTAR="cdist-${version}-1.src.tar.gz"
./PKGBUILD.in "${version}"
umask 022
mkaurball
burp -c system "${ARCHLINUXTAR}"
;;
pypi-release)
# Ensure that pypi release has the right version
"$0" version
make docs-clean
make docs
python3 setup.py sdist upload
;;
release-git-tag) release-git-tag)
target_version=$($0 changelog-version) target_version=$($0 changelog-version)
if git rev-parse --verify "refs/tags/${target_version}" 2>/dev/null; then if git rev-parse --verify refs/tags/$target_version 2>/dev/null; then
printf "Tag for %s exists, aborting\n" "${target_version}" echo "Tag for $target_version exists, aborting"
exit 1 exit 1
fi fi
printf "Enter tag description for %s: " "${target_version}" printf "Enter tag description for ${target_version}: "
read -r tagmessage read tagmessage
# setup for signed tags: # setup for signed tags:
# gpg --fulL-gen-key # gpg --fulL-gen-key
@ -199,8 +170,7 @@ eof
# gpg --verify <asc-file> <file> # gpg --verify <asc-file> <file>
# gpg --no-default-keyring --keyring <pubkey.gpg> --verify <asc-file> <file> # gpg --no-default-keyring --keyring <pubkey.gpg> --verify <asc-file> <file>
# Ensure gpg-agent is running. # Ensure gpg-agent is running.
GPG_TTY=$(tty) export GPG_TTY=$(tty)
export GPG_TTY
gpg-agent gpg-agent
git tag -s "$target_version" -m "$tagmessage" git tag -s "$target_version" -m "$tagmessage"
@ -210,14 +180,14 @@ eof
sign-git-release) sign-git-release)
if [ $# -lt 2 ] if [ $# -lt 2 ]
then then
printf "usage: %s sign-git-release TAG TOKEN [ARCHIVE]\n" "$0" printf "usage: $0 sign-git-release TAG TOKEN [ARCHIVE]\n"
printf " if ARCHIVE is not specified then it is created\n" printf " if ARCHIVE is not specified then it is created\n"
exit 1 exit 1
fi fi
tag="$1" tag="$1"
if ! git rev-parse -q --verify "${tag}" >/dev/null 2>&1 if ! git rev-parse -q --verify "${tag}" >/dev/null 2>&1
then then
printf "Tag \"%s\" not found.\n" "${tag}" printf "Tag \"${tag}\" not found.\n"
exit 1 exit 1
fi fi
token="$2" token="$2"
@ -225,53 +195,44 @@ eof
then then
archivename="$3" archivename="$3"
else else
archivename="cdist-${tag}.tar" archivename="cdist-${tag}.tar.gz"
git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \ git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \
|| exit 1 || exit 1
# make sure target version is generated
"$0" target-version
tar -x -f "${archivename}" || exit 1
cp cdist/version.py "cdist-${tag}/cdist/version.py" || exit 1
tar -c -f "${archivename}" "cdist-${tag}/" || exit 1
rm -r -f "cdist-${tag}/"
gzip "${archivename}" || exit 1
archivename="${archivename}.gz"
fi fi
gpg --armor --detach-sign "${archivename}" || exit 1 gpg --armor --detach-sign "${archivename}" || exit 1
project="ungleich-public%2Fcdist" # make github release
sed_cmd='s/^.*"markdown":"\([^"]*\)".*$/\1/' curl -H "Authorization: token ${token}" \
--request POST \
--data "{ \"tag_name\":\"${tag}\", \
\"target_commitish\":\"master\", \
\"name\": \"${tag}\", \
\"body\":\"${tag}\", \
\"draft\":false, \
\"prerelease\": false}" \
"https://api.github.com/repos/ungleich/cdist/releases" || exit 1
# upload archive # get release ID
response_archive=$(curl -f -X POST \ repoid=$(curl "https://api.github.com/repos/ungleich/cdist/releases/tags/${tag}" \
--http1.1 \ | python3 -c 'import json; import sys; print(json.loads(sys.stdin.read())["id"])') \
-H "PRIVATE-TOKEN: ${token}" \ || exit 1
-F "file=@${archivename}" \
"https://code.ungleich.ch/api/v4/projects/${project}/uploads" \
| sed "${sed_cmd}") || exit 1
# upload archive signature # upload archive and then signature
response_archive_sig=$(curl -f -X POST \ curl -H "Authorization: token ${token}" \
--http1.1 \ -H "Accept: application/vnd.github.manifold-preview" \
-H "PRIVATE-TOKEN: ${token}" \ -H "Content-Type: application/x-gtar" \
-F "file=@${archivename}.asc" \ --data-binary @${archivename} \
"https://code.ungleich.ch/api/v4/projects/${project}/uploads" \ "https://uploads.github.com/repos/ungleich/cdist/releases/${repoid}/assets?name=${archivename}" \
| sed "${sed_cmd}") || exit 1 || exit 1
curl -H "Authorization: token ${token}" \
# make release -H "Accept: application/vnd.github.manifold-preview" \
changelog=$("$0" changelog-changes "$1" | sed 's/^[[:space:]]*//') -H "Content-Type: application/pgp-signature" \
release_notes=$( --data-binary @${archivename}.asc \
printf "%s\n\n%s\n\n**Changelog**\n\n%s\n" \ "https://uploads.github.com/repos/ungleich/cdist/releases/${repoid}/assets?name=${archivename}.asc" \
"${response_archive}" "${response_archive_sig}" "${changelog}"
)
curl -f -X POST \
-H "PRIVATE-TOKEN: ${token}" \
-F "description=${release_notes}" \
"https://code.ungleich.ch/api/v4/projects/${project}/repository/tags/${tag}/release" \
|| exit 1 || exit 1
# remove generated files (archive and asc) # remove generated files (archive and asc)
if [ $# -eq 2 ] if [ $# -eq 2]
then then
rm -f "${archivename}" rm -f "${archivename}"
fi fi
@ -283,30 +244,29 @@ eof
target_version=$($0 changelog-version) target_version=$($0 changelog-version)
target_branch=$($0 version-branch) target_branch=$($0 version-branch)
printf "Beginning release process for %s\n" "${target_version}" echo "Beginning release process for $target_version"
# First check everything is sane # First check everything is sane
"$0" check-date "$0" check-date
"$0" check-unittest "$0" check-unittest
"$0" check-pycodestyle "$0" check-pep8
"$0" check-shellcheck
# Generate version file to be included in packaging # Generate version file to be included in packaging
"$0" target-version "$0" target-version
# Ensure the git status is clean, else abort # Ensure the git status is clean, else abort
if ! git diff-index --name-only --exit-code HEAD ; then if ! git diff-index --name-only --exit-code HEAD ; then
printf "Unclean tree, see files above, aborting.\n" echo "Unclean tree, see files above, aborting"
exit 1 exit 1
fi fi
# Ensure we are on the master branch # Ensure we are on the master branch
masterbranch=yes masterbranch=yes
if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
printf "Releases are happening from the master branch, aborting.\n" echo "Releases are happening from the master branch, aborting"
printf "Enter the magic word to release anyway:" echo "Enter the magic word to release anyway"
read -r magicword read magicword
if [ "$magicword" = "iknowwhatido" ]; then if [ "$magicword" = "iknowwhatido" ]; then
masterbranch=no masterbranch=no
@ -317,7 +277,7 @@ eof
if [ "$masterbranch" = yes ]; then if [ "$masterbranch" = yes ]; then
# Ensure version branch exists # Ensure version branch exists
if ! git rev-parse --verify "refs/heads/${target_branch}" 2>/dev/null; then if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then
git branch "$target_branch" git branch "$target_branch"
fi fi
@ -335,12 +295,20 @@ eof
make docs-clean make docs-clean
make docs make docs
# Generate speeches (indirect check if they build)
make speeches
############################################################# #############################################################
# Everything green, let's do the release # Everything green, let's do the release
# Tag the current commit # Tag the current commit
"$0" release-git-tag "$0" release-git-tag
# sign git tag
printf "Enter github authentication token: "
read token
"$0" sign-git-release "${target_version}" "${token}"
# Also merge back the version branch # Also merge back the version branch
if [ "$masterbranch" = yes ]; then if [ "$masterbranch" = yes ]; then
git checkout master git checkout master
@ -348,41 +316,41 @@ eof
fi fi
# Publish git changes # Publish git changes
# if you want to have mirror locally then uncomment this and comment below make pub
# git push --mirror
git push # publish man, speeches, website
# push also new branch and set up tracking if [ "$masterbranch" = yes ]; then
git push -u origin "${target_branch}" make web-release-all
# fi else
make web-release-all-no-latest
fi
# Ensure that pypi release has the right version
"$0" version
# Create and publish package for pypi # Create and publish package for pypi
"$0" pypi-release make pypi-release
# sign git tag # Archlinux release is based on pypi
printf "Enter upstream repository authentication token: " make archlinux-release
read -r token
"$0" sign-git-release "${target_version}" "${token}"
# Announce change on ML # Announce change on ML
"$0" ml-release "${target_version}" make ml-release
cat << eof cat << eof
Manual steps post release: Manual steps post release:
- cdist-web
- send mail body generated in mailinglist.tmp and inform Dmitry for deb - linkedin
- hackernews
- reddit
- twitter - twitter
eof eof
;; ;;
test) test)
if [ ! -f "cdist/version.py" ] export PYTHONPATH="$(pwd -P)"
then
printf "cdist/version.py is missing, generate it first.\n"
exit 1
fi
PYTHONPATH="$(pwd -P)"
export PYTHONPATH
if [ $# -lt 1 ]; then if [ $# -lt 1 ]; then
python3 -m cdist.test python3 -m cdist.test
@ -392,30 +360,22 @@ eof
;; ;;
test-remote) test-remote)
if [ ! -f "cdist/version.py" ] export PYTHONPATH="$(pwd -P)"
then
printf "cdist/version.py is missing, generate it first.\n"
exit 1
fi
PYTHONPATH="$(pwd -P)"
export PYTHONPATH
python3 -m cdist.test.exec.remote python3 -m cdist.test.exec.remote
;; ;;
pycodestyle|pep8) pep8)
pycodestyle "${basedir}" "${basedir}/scripts/cdist" | less pep8 "${basedir}" "${basedir}/scripts/cdist" | less
;; ;;
check-pycodestyle) check-pep8)
"$0" pycodestyle "$0" pep8
printf "\\nPlease review pycodestyle report.\\n" echo "Please review pep8 report."
while true while true
do do
printf "Continue (yes/no)?\n" echo "Continue (yes/no)?"
any= any=
read -r any read any
case "$any" in case "$any" in
yes) yes)
break break
@ -424,83 +384,7 @@ eof
exit 1 exit 1
;; ;;
*) *)
printf "Please answer with 'yes' or 'no' explicitly.\n" echo "Please answer with 'yes' or 'no' explicitly."
;;
esac
done
;;
shellcheck-global-explorers)
find cdist/conf/explorer -type f -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
;;
shellcheck-type-explorers)
find cdist/conf/type -type f -path "*/explorer/*" -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
;;
shellcheck-manifests)
find cdist/conf/type -type f -name manifest -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
;;
shellcheck-local-gencodes)
find cdist/conf/type -type f -name gencode-local -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
;;
shellcheck-remote-gencodes)
find cdist/conf/type -type f -name gencode-remote -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
;;
shellcheck-scripts)
${SHELLCHECKCMD} scripts/cdist-dump scripts/cdist-new-type || exit 0
;;
shellcheck-gencodes)
"$0" shellcheck-local-gencodes
"$0" shellcheck-remote-gencodes
;;
shellcheck-types)
"$0" shellcheck-type-explorers
"$0" shellcheck-manifests
"$0" shellcheck-gencodes
;;
shellcheck)
"$0" shellcheck-global-explorers
"$0" shellcheck-types
"$0" shellcheck-scripts
;;
shellcheck-type-files)
find cdist/conf/type -type f -path "*/files/*" -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
;;
shellcheck-with-files)
"$0" shellcheck
"$0" shellcheck-type-files
;;
shellcheck-build-helper)
${SHELLCHECKCMD} ./bin/build-helper
;;
check-shellcheck)
"$0" shellcheck
printf "\\nPlease review shellcheck report.\\n"
while true
do
printf "Continue (yes/no)?\n"
any=
read -r any
case "$any" in
yes)
break
;;
no)
exit 1
;;
*)
printf "Please answer with 'yes' or 'no' explicitly.\n"
;; ;;
esac esac
done done
@ -511,39 +395,16 @@ eof
;; ;;
version) version)
printf "VERSION = \"%s\"\n" "$(git describe)" > cdist/version.py echo "VERSION = \"$(git describe)\"" > cdist/version.py
;; ;;
target-version) target-version)
target_version=$($0 changelog-version) target_version=$($0 changelog-version)
printf "VERSION = \"%s\"\n" "${target_version}" > cdist/version.py echo "VERSION = \"${target_version}\"" > cdist/version.py
;; ;;
clean)
make clean
# Archlinux
rm -f cdist-*.pkg.tar.xz cdist-*.tar.gz
rm -rf pkg/ src/
rm -f MANIFEST PKGBUILD
rm -rf dist/
# Signed release
rm -f cdist-*.tar.gz
rm -f cdist-*.tar.gz.asc
# Temp files
rm -f ./*.tmp
;;
distclean)
"$0" clean
rm -f cdist/version.py
;;
*) *)
printf "Unknown target: '%s'.\n" "${option}" >&2 echo "Unknown helper target $@ - aborting"
usage "${basename}"
exit 1 exit 1
;; ;;

473
bin/build-helper.freebsd Executable file
View file

@ -0,0 +1,473 @@
#!/bin/sh
#
# 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
# 2016 Darko Poljak (darko.poljak at gmail.com)
#
# This file is part of cdist.
#
# cdist is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# cdist is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
#
#
# This file contains the heavy lifting found usually in the Makefile
#
# vars for make
helper=$0
basedir=${0%/*}/../
# run_as is used to check how the script is called (by $0 value)
# currently supported sufixes for $0 are:
# .freebsd - run as freebsd
basename=${0##*/}
run_as=${basename#*.}
case "$run_as" in
freebsd)
to_a=cdist-configuration-management
to_d=googlegroups.com
from_a=darko.poljak
from_d=gmail.com
ml_name="Darko Poljak"
ml_sig_name="Darko"
# vars for make
WEBDIR=../vcs/www.nico.schottelius.org
;;
*)
to_a=cdist
to_d=l.schottelius.org
from_a=nico-cdist
from_d=schottelius.org
ml_name="Nico -telmich- Schottelius"
ml_sig_name="Nico"
# vars for make
WEBDIR=$$HOME/vcs/www.nico.schottelius.org
;;
esac
# Change to checkout directory
cd "$basedir"
version=$(git describe)
option=$1; shift
case "$option" in
print-make-vars)
printf "helper: ${helper}\n"
printf "WEBDIR: ${WEBDIR}\n"
;;
print-runas)
printf "run_as: $run_as\n"
;;
changelog-changes)
if [ "$#" -eq 1 ]; then
start=$1
else
start="[[:digit:]]"
fi
end="[[:digit:]]"
awk -F: "BEGIN { start=0 }
{
if(start == 0) {
if (\$0 ~ /^$start/) {
start = 1
}
} else {
if (\$0 ~ /^$end/) {
exit
} else {
print \$0
}
}
}" "$basedir/docs/changelog"
;;
changelog-version)
# get version from changelog
grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/:.*//'
;;
check-date)
# verify date in changelog is today
date_today="$(date +%Y-%m-%d)"
date_changelog=$(grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/.*: //')
if [ "$date_today" != "$date_changelog" ]; then
echo "Date in changelog is not today"
echo "Changelog: $date_changelog"
exit 1
fi
;;
check-unittest)
"$0" test
;;
blog)
version=$1; shift
blogfile=$1; shift
dir=${blogfile%/*}
file=${blogfile##*/}
cat << eof > "$blogfile"
[[!meta title="Cdist $version released"]]
Here's a short overview about the changes found in version ${version}:
eof
$0 changelog-changes "$version" >> "$blogfile"
cat << eof >> "$blogfile"
For more information visit the [[cdist homepage|software/cdist]].
[[!tag cdist config unix]]
eof
cd "$dir"
git add "$file"
# Allow git commit to fail if there are no changes
git commit -m "cdist blog update: $version" "$blogfile" || true
;;
ml-release)
if [ $# -ne 1 ]; then
echo "$0 ml-release version" >&2
exit 1
fi
version=$1; shift
to=${to_a}@${to_d}
from=${from_a}@${from_d}
(
cat << eof
From: ${ml_name} <$from>
To: cdist mailing list <$to>
Subject: cdist $version released
Hello .*,
cdist $version has been released with the following changes:
eof
"$0" changelog-changes "$version"
cat << eof
Cheers,
${ml_sig_name}
--
Automatisation at its best level. With cdist.
eof
) | /usr/sbin/sendmail -f "$from" "$to"
;;
release-git-tag)
target_version=$($0 changelog-version)
if git rev-parse --verify refs/tags/$target_version 2>/dev/null; then
echo "Tag for $target_version exists, aborting"
exit 1
fi
printf "Enter tag description for ${target_version}: "
read tagmessage
# setup for signed tags:
# gpg --fulL-gen-key
# gpg --list-secret-keys --keyid-format LONG
# git config --local user.signingkey <id>
# for exporting pub key:
# gpg --armor --export <id> > pubkey.asc
# gpg --output pubkey.gpg --export <id>
# show tag with signature
# git show <tag>
# verify tag signature
# git tag -v <tag>
#
# gpg verify signature
# gpg --verify <asc-file> <file>
# gpg --no-default-keyring --keyring <pubkey.gpg> --verify <asc-file> <file>
# Ensure gpg-agent is running.
export GPG_TTY=$(tty)
gpg-agent
git tag -s "$target_version" -m "$tagmessage"
git push --tags
;;
sign-git-release)
if [ $# -lt 2 ]
then
printf "usage: $0 sign-git-release TAG TOKEN [ARCHIVE]\n"
printf " if ARCHIVE is not specified then it is created\n"
exit 1
fi
tag="$1"
if ! git rev-parse -q --verify "${tag}" >/dev/null 2>&1
then
printf "Tag \"${tag}\" not found.\n"
exit 1
fi
token="$2"
if [ $# -gt 2 ]
then
archivename="$3"
else
archivename="cdist-${tag}.tar.gz"
git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \
|| exit 1
fi
gpg --armor --detach-sign "${archivename}" || exit 1
# make github release
curl -H "Authorization: token ${token}" \
--request POST \
--data "{ \"tag_name\":\"${tag}\", \
\"target_commitish\":\"master\", \
\"name\": \"${tag}\", \
\"body\":\"${tag}\", \
\"draft\":false, \
\"prerelease\": false}" \
"https://api.github.com/repos/ungleich/cdist/releases" || exit 1
# get release ID
repoid=$(curl "https://api.github.com/repos/ungleich/cdist/releases/tags/${tag}" \
| python3 -c 'import json; import sys; print(json.loads(sys.stdin.read())["id"])') \
|| exit 1
# upload archive and then signature
curl -H "Authorization: token ${token}" \
-H "Accept: application/vnd.github.manifold-preview" \
-H "Content-Type: application/x-gtar" \
--data-binary @${archivename} \
"https://uploads.github.com/repos/ungleich/cdist/releases/${repoid}/assets?name=${archivename}" \
|| exit 1
curl -H "Authorization: token ${token}" \
-H "Accept: application/vnd.github.manifold-preview" \
-H "Content-Type: application/pgp-signature" \
--data-binary @${archivename}.asc \
"https://uploads.github.com/repos/ungleich/cdist/releases/${repoid}/assets?name=${archivename}.asc" \
|| exit 1
# remove generated files (archive and asc)
if [ $# -eq 2]
then
rm -f "${archivename}"
fi
rm -f "${archivename}.asc"
;;
release)
set -e
target_version=$($0 changelog-version)
target_branch=$($0 version-branch)
echo "Beginning release process for $target_version"
# First check everything is sane
"$0" check-date
"$0" check-unittest
"$0" check-pep8
# Generate version file to be included in packaging
"$0" target-version
# Ensure the git status is clean, else abort
if ! git diff-index --name-only --exit-code HEAD ; then
echo "Unclean tree, see files above, aborting"
exit 1
fi
# Ensure we are on the master branch
masterbranch=yes
if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
echo "Releases are happening from the master branch, aborting"
echo "Enter the magic word to release anyway"
read magicword
if [ "$magicword" = "iknowwhatido" ]; then
masterbranch=no
else
exit 1
fi
fi
if [ "$masterbranch" = yes ]; then
# Ensure version branch exists
if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then
git branch "$target_branch"
fi
# Merge master branch into version branch
git checkout "$target_branch"
git merge master
fi
# Verify that after the merge everything works
"$0" check-date
"$0" check-unittest
# Generate documentation (man and html)
# First, clean old generated docs
make helper=${helper} WEBDIR=${WEBDIR} docs-clean
make helper=${helper} WEBDIR=${WEBDIR} docs
# Generate speeches (indirect check if they build)
make helper=${helper} WEBDIR=${WEBDIR} speeches
#############################################################
# Everything green, let's do the release
# Tag the current commit
"$0" release-git-tag
# sign git tag
printf "Enter github authentication token: "
read token
"$0" sign-git-release "${target_version}" "${token}"
# Also merge back the version branch
if [ "$masterbranch" = yes ]; then
git checkout master
git merge "$target_branch"
fi
# Publish git changes
case "$run_as" in
freebsd)
# if we are not Nico :) then just push, no mirror
git push
# push also new branch and set up tracking
git push -u origin "${target_branch}"
;;
*)
make helper=${helper} WEBDIR=${WEBDIR} pub
;;
esac
# publish man, speeches, website
if [ "$masterbranch" = yes ]; then
make helper=${helper} WEBDIR=${WEBDIR} web-release-all
else
make helper=${helper} WEBDIR=${WEBDIR} web-release-all-no-latest
fi
# Ensure that pypi release has the right version
"$0" version
# Create and publish package for pypi
make helper=${helper} WEBDIR=${WEBDIR} pypi-release
case "$run_as" in
freebsd)
;;
*)
# Archlinux release is based on pypi
make archlinux-release
;;
esac
# Announce change on ML
make helper=${helper} WEBDIR=${WEBDIR} ml-release
cat << eof
Manual steps post release:
- linkedin
- hackernews
- reddit
- twitter
eof
case "$run_as" in
freebsd)
cat <<eof
Additional steps post release:
- archlinux release
eof
;;
*)
;;
esac
;;
test)
export PYTHONPATH="$(pwd -P)"
if [ $# -lt 1 ]; then
python3 -m cdist.test
else
python3 -m unittest "$@"
fi
;;
test-remote)
export PYTHONPATH="$(pwd -P)"
python3 -m cdist.test.exec.remote
;;
pep8)
pep8 "${basedir}" "${basedir}/scripts/cdist" | less
;;
check-pep8)
"$0" pep8
echo "Please review pep8 report."
while true
do
echo "Continue (yes/no)?"
any=
read any
case "$any" in
yes)
break
;;
no)
exit 1
;;
*)
echo "Please answer with 'yes' or 'no' explicitly."
;;
esac
done
;;
version-branch)
"$0" changelog-version | cut -d. -f '1,2'
;;
version)
echo "VERSION = \"$(git describe)\"" > cdist/version.py
;;
target-version)
target_version=$($0 changelog-version)
echo "VERSION = \"${target_version}\"" > cdist/version.py
;;
*)
echo "Unknown helper target $@ - aborting"
exit 1
;;
esac

View file

@ -181,40 +181,17 @@ class CdistObjectError(CdistEntityError):
params, stdout_paths, stderr_paths, subject) params, stdout_paths, stderr_paths, subject)
class CdistObjectExplorerError(CdistEntityError):
"""
Something went wrong while working on a specific
cdist object explorer
"""
def __init__(self, cdist_object, explorer_name, explorer_path,
stderr_path, subject=''):
params = [
('object name', cdist_object.name, ),
('object path', cdist_object.absolute_path, ),
('object source', " ".join(cdist_object.source), ),
('object type', os.path.realpath(
cdist_object.cdist_type.absolute_path), ),
('explorer name', explorer_name, ),
('explorer path', explorer_path, ),
]
stdout_paths = []
stderr_paths = [
('remote', stderr_path, ),
]
super().__init__("explorer '{}' of object '{}'".format(
explorer_name, cdist_object.name), params, stdout_paths,
stderr_paths, subject)
class InitialManifestError(CdistEntityError): class InitialManifestError(CdistEntityError):
"""Something went wrong while executing initial manifest""" """Something went wrong while executing initial manifest"""
def __init__(self, initial_manifest, stdout_path, stderr_path, subject=''): def __init__(self, initial_manifest, stdout_path, stderr_path, subject=''):
params = [ params = [
('path', initial_manifest, ), ('path', initial_manifest, ),
] ]
stdout_paths = []
stdout_paths = [ stdout_paths = [
('init', stdout_path, ), ('init', stdout_path, ),
] ]
stderr_paths = []
stderr_paths = [ stderr_paths = [
('init', stderr_path, ), ('init', stderr_path, ),
] ]
@ -222,20 +199,6 @@ class InitialManifestError(CdistEntityError):
stderr_paths, subject) stderr_paths, subject)
class GlobalExplorerError(CdistEntityError):
"""Something went wrong while executing global explorer"""
def __init__(self, name, path, stderr_path, subject=''):
params = [
('name', name, ),
('path', path, ),
]
stderr_paths = [
('remote', stderr_path, ),
]
super().__init__("global explorer '{}'".format(name),
params, [], stderr_paths, subject)
def file_to_list(filename): def file_to_list(filename):
"""Return list from \n seperated file""" """Return list from \n seperated file"""
if os.path.isfile(filename): if os.path.isfile(filename):

View file

@ -11,9 +11,9 @@ import cdist.configuration
BETA_COMMANDS = set(('install', 'inventory', )) BETA_COMMANDS = set(('install', 'inventory', ))
# set of beta arguments for sub-commands # set of beta arguments for sub-commands
BETA_ARGS = { BETA_ARGS = {
'config': set(('tag', 'all_tagged_hosts', 'use_archiving', )), 'config': set(('jobs', 'tag', 'all_tagged_hosts', 'use_archiving', )),
} }
EPILOG = "Get cdist at https://code.ungleich.ch/ungleich-public/cdist" EPILOG = "Get cdist at http://www.nico.schottelius.org/software/cdist/"
# Parser others can reuse # Parser others can reuse
parser = None parser = None
@ -161,16 +161,6 @@ def get_parsers():
# Config # Config
parser['config_main'] = argparse.ArgumentParser(add_help=False) parser['config_main'] = argparse.ArgumentParser(add_help=False)
parser['config_main'].add_argument(
'-4', '--force-ipv4',
help=('Force to use IPv4 addresses only. No influence for custom'
' remote commands.'),
action='store_const', dest='force_ipv', const=4)
parser['config_main'].add_argument(
'-6', '--force-ipv6',
help=('Force to use IPv6 addresses only. No influence for custom'
' remote commands.'),
action='store_const', dest='force_ipv', const=6)
parser['config_main'].add_argument( parser['config_main'].add_argument(
'-C', '--cache-path-pattern', '-C', '--cache-path-pattern',
help=('Specify custom cache path pattern. If ' help=('Specify custom cache path pattern. If '
@ -191,7 +181,8 @@ def get_parsers():
name="positive int"), name="positive int"),
help=('Operate in parallel in specified maximum number of jobs. ' help=('Operate in parallel in specified maximum number of jobs. '
'Global explorers, object prepare and object run are ' 'Global explorers, object prepare and object run are '
'supported. Without argument CPU count is used by default. '), 'supported. Without argument CPU count is used by default. '
'Currently in beta.'),
action='store', dest='jobs', action='store', dest='jobs',
const=multiprocessing.cpu_count()) const=multiprocessing.cpu_count())
parser['config_main'].add_argument( parser['config_main'].add_argument(
@ -200,11 +191,6 @@ def get_parsers():
parser['config_main'].add_argument( parser['config_main'].add_argument(
'-o', '--out-dir', '-o', '--out-dir',
help='Directory to save cdist output in.', dest="out_path") help='Directory to save cdist output in.', dest="out_path")
parser['config_main'].add_argument(
'-P', '--timestamp',
help=('Timestamp log messages with the current local date and time '
'in the format: YYYYMMDDHHMMSS.us.'),
action='store_true', dest='timestamp')
parser['config_main'].add_argument( parser['config_main'].add_argument(
'-R', '--use-archiving', nargs='?', '-R', '--use-archiving', nargs='?',
choices=('tar', 'tgz', 'tbz2', 'txz',), choices=('tar', 'tgz', 'tbz2', 'txz',),
@ -234,13 +220,19 @@ def get_parsers():
'(should behave like ssh).'), '(should behave like ssh).'),
action='store', dest='remote_exec', action='store', dest='remote_exec',
default=None) default=None)
parser['config_main'].add_argument(
'-S', '--disable-saving-output-streams',
help='Disable saving output streams.',
action='store_false', dest='save_output_streams', default=True)
# Config # Config
parser['config_args'] = argparse.ArgumentParser(add_help=False) parser['config_args'] = argparse.ArgumentParser(add_help=False)
parser['config_args'].add_argument(
'-4', '--force-ipv4',
help=('Force to use IPv4 addresses only. No influence for custom'
' remote commands.'),
action='store_const', dest='force_ipv', const=4)
parser['config_args'].add_argument(
'-6', '--force-ipv6',
help=('Force to use IPv6 addresses only. No influence for custom'
' remote commands.'),
action='store_const', dest='force_ipv', const=6)
parser['config_args'].add_argument( parser['config_args'].add_argument(
'-A', '--all-tagged', '-A', '--all-tagged',
help=('Use all hosts present in tags db. Currently in beta.'), help=('Use all hosts present in tags db. Currently in beta.'),
@ -250,6 +242,8 @@ def get_parsers():
help=('List hosts that have all specified tags, ' help=('List hosts that have all specified tags, '
'if -t/--tag is specified.'), 'if -t/--tag is specified.'),
action="store_true", dest="has_all_tags", default=False) action="store_true", dest="has_all_tags", default=False)
parser['config_args'].add_argument(
'host', nargs='*', help='Host(s) to operate on.')
parser['config_args'].add_argument( parser['config_args'].add_argument(
'-f', '--file', '-f', '--file',
help=('Read specified file for a list of additional hosts to ' help=('Read specified file for a list of additional hosts to '
@ -257,6 +251,11 @@ def get_parsers():
'line). If no host or host file is specified then, by ' 'line). If no host or host file is specified then, by '
'default, read hosts from stdin.'), 'default, read hosts from stdin.'),
dest='hostfile', required=False) dest='hostfile', required=False)
parser['config_args'].add_argument(
'-P', '--timestamp',
help=('Timestamp log messages with the current local date and time '
'in the format: YYYYMMDDHHMMSS.us.'),
action='store_true', dest='timestamp')
parser['config_args'].add_argument( parser['config_args'].add_argument(
'-p', '--parallel', nargs='?', metavar='HOST_MAX', '-p', '--parallel', nargs='?', metavar='HOST_MAX',
type=functools.partial(check_lower_bounded_int, lower_bound=1, type=functools.partial(check_lower_bounded_int, lower_bound=1,
@ -266,6 +265,10 @@ def get_parsers():
'default.'), 'default.'),
action='store', dest='parallel', action='store', dest='parallel',
const=multiprocessing.cpu_count()) const=multiprocessing.cpu_count())
parser['config_args'].add_argument(
'-S', '--disable-saving-output-streams',
help='Disable saving output streams.',
action='store_false', dest='save_output_streams', default=True)
parser['config_args'].add_argument( parser['config_args'].add_argument(
'-s', '--sequential', '-s', '--sequential',
help='Operate on multiple hosts sequentially (default).', help='Operate on multiple hosts sequentially (default).',
@ -276,8 +279,6 @@ def get_parsers():
'list all hosts that contain any of specified tags. ' 'list all hosts that contain any of specified tags. '
'Currently in beta.'), 'Currently in beta.'),
dest='tag', required=False, action="store_true", default=False) dest='tag', required=False, action="store_true", default=False)
parser['config_args'].add_argument(
'host', nargs='*', help='Host(s) to operate on.')
parser['config'] = parser['sub'].add_parser( parser['config'] = parser['sub'].add_parser(
'config', parents=[parser['loglevel'], parser['beta'], 'config', parents=[parser['loglevel'], parser['beta'],
parser['common'], parser['common'],

View file

@ -28,10 +28,6 @@ case "$os" in
sysctl -n hw.physicalcpu sysctl -n hw.physicalcpu
;; ;;
"openbsd")
sysctl -n hw.ncpuonline
;;
*) *)
if [ -r /proc/cpuinfo ]; then if [ -r /proc/cpuinfo ]; then
cores="$(grep "core id" /proc/cpuinfo | sort | uniq | wc -l)" cores="$(grep "core id" /proc/cpuinfo | sort | uniq | wc -l)"

View file

@ -25,14 +25,14 @@
os=$("$__explorer/os") os=$("$__explorer/os")
case "$os" in case "$os" in
"macosx") "macosx")
system_profiler SPHardwareDataType | grep "Number of Processors" | awk -F': ' '{print $2}' system_profiler SPHardwareDataType | grep "Number of Processors" | awk -F ': ' '/Number of Processors/ {print $2}'
;; ;;
*) *)
if [ -r /proc/cpuinfo ]; then if [ -r /proc/cpuinfo ]; then
sockets="$(grep "physical id" /proc/cpuinfo | sort -u | wc -l)" sockets=$(grep "physical id" /proc/cpuinfo | sort -u | wc -l)
if [ "${sockets}" -eq 0 ]; then if [ "${sockets}" -eq 0 ]; then
sockets="$(grep -c "processor" /proc/cpuinfo)" sockets=$(grep -cE "^processor\s+:" /proc/cpuinfo)
fi fi
echo "${sockets}" echo "${sockets}"
fi fi

29
cdist/conf/explorer/disks Executable file → Normal file
View file

@ -1,27 +1,2 @@
#!/bin/sh cd /dev || exit 0
echo sd? hd? vd?
uname_s="$(uname -s)"
case "${uname_s}" in
FreeBSD)
sysctl -n kern.disks
;;
OpenBSD|NetBSD)
sysctl -n hw.disknames | grep -Eo '[lsw]d[0-9]+' | xargs
;;
Linux)
if command -v lsblk > /dev/null
then
# exclude ram disks, floppies and cdroms
# https://www.kernel.org/doc/Documentation/admin-guide/devices.txt
lsblk -e 1,2,11 -dno name | xargs
else
printf "Don't know how to list disks for %s operating system without lsblk, if you can please submit a patch\n" "${uname_s}" >&2
fi
;;
*)
printf "Don't know how to list disks for %s operating system, if you can please submit a patch\n" "${uname_s}" >&2
;;
esac
exit 0

View file

@ -29,7 +29,7 @@ case "$uname_s" in
Linux) Linux)
(pgrep -P0 -l | awk '/^1[ \t]/ {print $2;}') || true (pgrep -P0 -l | awk '/^1[ \t]/ {print $2;}') || true
;; ;;
FreeBSD|OpenBSD) FreeBSD)
ps -o comm= -p 1 || true ps -o comm= -p 1 || true
;; ;;
*) *)

View file

@ -1,6 +1,6 @@
#!/bin/sh -e #!/bin/sh
# #
# 2019 Ander Punnar (ander-at-kvlt-dot-ee) # 2012 Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -17,14 +17,35 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
#
# List all network interfaces in explorer/ifaces. One interface per line.
#
# If your OS is not supported please provide a ifconfig output
#
if command -v ip > /dev/null # Use ip, if available
then if command -v ip >/dev/null; then
ip -o link show | sed -n 's/^[0-9]\+: \(.\+\): <.*/\1/p' ip -o link show | sed -n 's/^[0-9]\+: \(.\+\): <.*/\1/p'
exit 0
elif command -v ifconfig > /dev/null
then
ifconfig -a \
| sed -n -E 's/^(.*)(:[[:space:]]*flags=|Link encap).*/\1/p' \
| sort -u
fi fi
if ! command -v ifconfig >/dev/null; then
# no ifconfig, nothing we could do
exit 0
fi
uname_s="$(uname -s)"
REGEXP='s/^(.*)(:[[:space:]]*flags=|Link encap).*/\1/p'
case "$uname_s" in
Darwin)
ifconfig -a | sed -n -E "$REGEXP"
;;
Linux|*BSD)
ifconfig -a | sed -n -r "$REGEXP"
;;
*)
echo "Unsupported ifconfig output for $uname_s" >&2
exit 1
;;
esac

1
cdist/conf/explorer/is-freebsd-jail Executable file → Normal file
View file

@ -1,2 +1 @@
#!/bin/sh
sysctl -n security.jail.jailed 2>/dev/null | grep "1" || true sysctl -n security.jail.jailed 2>/dev/null | grep "1" || true

1
cdist/conf/explorer/kernel_name Executable file → Normal file
View file

@ -1,2 +1 @@
#!/bin/sh
uname -s uname -s

View file

@ -20,9 +20,8 @@
# #
set +e set +e
case "$("$__explorer/os")" in case "$("${__explorer}"/os)" in
openwrt) openwrt)
# shellcheck disable=SC1091
(. /etc/openwrt_release && echo "$DISTRIB_CODENAME") (. /etc/openwrt_release && echo "$DISTRIB_CODENAME")
;; ;;
*) *)

View file

@ -20,9 +20,8 @@
# #
set +e set +e
case "$("$__explorer/os")" in case "$("${__explorer}"/os)" in
openwrt) openwrt)
# shellcheck disable=SC1091
(. /etc/openwrt_release && echo "$DISTRIB_DESCRIPTION") (. /etc/openwrt_release && echo "$DISTRIB_DESCRIPTION")
;; ;;
*) *)

View file

@ -20,9 +20,8 @@
# #
set +e set +e
case "$("$__explorer/os")" in case "$("${__explorer}"/os)" in
openwrt) openwrt)
# shellcheck disable=SC1091
(. /etc/openwrt_release && echo "$DISTRIB_ID") (. /etc/openwrt_release && echo "$DISTRIB_ID")
;; ;;
*) *)

View file

@ -20,9 +20,8 @@
# #
set +e set +e
case "$("$__explorer/os")" in case "$("${__explorer}"/os)" in
openwrt) openwrt)
# shellcheck disable=SC1091
(. /etc/openwrt_release && echo "$DISTRIB_RELEASE") (. /etc/openwrt_release && echo "$DISTRIB_RELEASE")
;; ;;
*) *)

View file

@ -22,6 +22,6 @@
# #
# #
if command -v uname >/dev/null 2>&1 ; then if command -v uname > /dev/null 2>&1; then
uname -m uname -m
fi fi

View file

@ -22,7 +22,7 @@
# #
# #
case "$("$__explorer/os")" in case "$("${__explorer}"/os)" in
amazon) amazon)
cat /etc/system-release cat /etc/system-release
;; ;;

View file

@ -18,14 +18,6 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
[ ! -e "/$__object_id" ] && exit 0 if [ -e "/$__object_id" ]
then getfacl "/$__object_id" | grep -E '^((default:|)(user|group)):[a-z]' || true
if ! command -v getfacl > /dev/null
then
echo 'getfacl not available' >&2
exit 1
fi fi
getfacl "/$__object_id" 2>/dev/null \
| grep -Eo '^(default:)?(user|group|(mask|other):):[^:][[:graph:]]+' \
|| true

View file

@ -1,39 +0,0 @@
#!/bin/sh -e
#
# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
#
# 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/>.
#
# TODO check if filesystem has ACL turned on etc
if [ -f "$__object/parameter/acl" ]
then
grep -E '^(default:)?(user|group):' "$__object/parameter/acl" \
| while read -r acl
do
param="$( echo "$acl" | awk -F: '{print $(NF-2)}' )"
check="$( echo "$acl" | awk -F: '{print $(NF-1)}' )"
[ "$param" = 'user' ] && db=passwd || db="$param"
if ! getent "$db" "$check" > /dev/null
then
echo "missing $param '$check'" >&2
exit 1
fi
done
fi

View file

@ -18,67 +18,32 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
file_is="$( cat "$__object/explorer/file_is" )"
[ "$file_is" = 'missing' ] && [ -z "$__cdist_dry_run" ] && exit 0
os="$( cat "$__global/explorer/os" )" os="$( cat "$__global/explorer/os" )"
acl_path="/$__object_id" acl_path="/$__object_id"
acl_is="$( cat "$__object/explorer/acl_is" )" acl_is="$( cat "$__object/explorer/acl_is" )"
if [ -f "$__object/parameter/acl" ] acl_should="$( for parameter in user group
then do
acl_should="$( cat "$__object/parameter/acl" )" if [ ! -f "$__object/parameter/$parameter" ]
elif then continue
[ -f "$__object/parameter/user" ] \ fi
|| [ -f "$__object/parameter/group" ] \ while read -r l
|| [ -f "$__object/parameter/mask" ] \
|| [ -f "$__object/parameter/other" ]
then
acl_should="$( for param in user group mask other
do do
[ ! -f "$__object/parameter/$param" ] && continue echo "$parameter:$l"
echo "$param" | grep -Eq 'mask|other' && sep=:: || sep=: if [ -f "$__object/parameter/default" ]
then echo "default:$parameter:$l"
echo "$param$sep$( cat "$__object/parameter/$param" )" fi
done )" done < "$__object/parameter/$parameter"
else done )"
echo 'no parameters set' >&2
exit 1
fi
if [ -f "$__object/parameter/default" ]
then
acl_should="$( echo "$acl_should" \
| sed 's/^default://' \
| sort -u \
| sed 's/\(.*\)/default:\1\n\1/' )"
fi
if [ "$file_is" = 'regular' ] \
&& echo "$acl_should" | grep -Eq '^default:'
then
# only directories can have default ACLs,
# but instead of error,
# let's just remove default entries
acl_should="$( echo "$acl_should" | grep -Ev '^default:' )"
fi
if echo "$acl_should" | awk -F: '{ print $NF }' | grep -Fq 'X'
then
[ "$file_is" = 'directory' ] && rep=x || rep=-
acl_should="$( echo "$acl_should" | sed "s/\\(.*\\)X/\\1$rep/" )"
fi
setfacl_exec='setfacl' setfacl_exec='setfacl'
if [ -f "$__object/parameter/recursive" ] if [ -f "$__object/parameter/recursive" ]
then then
if echo "$os" | grep -Fq 'freebsd' if echo "$os" | grep -E 'macosx|netbsd|freebsd|openbsd'
then then
echo "$os setfacl do not support recursive operations" >&2 echo "$os setfacl do not support recursive operations" >&2
else else
@ -88,39 +53,29 @@ fi
if [ -f "$__object/parameter/remove" ] if [ -f "$__object/parameter/remove" ]
then then
if echo "$os" | grep 'solaris'
then
# Solaris setfacl behaves differently.
# We will not support Solaris for now, because no way to test it.
# But adding support should be easy (use -s instead of -m on modify).
echo "$os setfacl do not support -x flag for ACL remove" >&2
else
echo "$acl_is" | while read -r acl echo "$acl_is" | while read -r acl
do do
# skip wanted ACL entries which already exist if echo "$acl_should" | grep -Fq "$acl"
# and skip mask and other entries, because we
# can't actually remove them, but only change.
if echo "$acl_should" | grep -Eq "^$acl" \
|| echo "$acl" | grep -Eq '^(default:)?(mask|other)'
then continue then continue
fi fi
if echo "$os" | grep -Fq 'freebsd' no_bits="$( echo "$acl" | sed -r 's/:[rwx-]+$//' )"
then
remove="$acl"
else
remove="$( echo "$acl" | sed 's/:...$//' )"
fi
echo "$setfacl_exec -x \"$remove\" \"$acl_path\"" echo "$setfacl_exec -x \"$no_bits\" \"$acl_path\""
echo "removed '$remove'" >> "$__messages_out"
done done
fi
fi fi
for acl in $acl_should for acl in $acl_should
do do
if ! echo "$acl_is" | grep -Eq "^$acl" if ! echo "$acl_is" | grep -Eq "^$acl"
then then echo "$setfacl_exec -m \"$acl\" \"$acl_path\""
if echo "$os" | grep -Fq 'freebsd' \
&& echo "$acl" | grep -Eq '^default:'
then
echo "setting default ACL in $os is currently not supported" >&2
else
echo "$setfacl_exec -m \"$acl\" \"$acl_path\""
echo "added '$acl'" >> "$__messages_out"
fi
fi fi
done done

View file

@ -3,41 +3,35 @@ cdist-type__acl(7)
NAME NAME
---- ----
cdist-type__acl - Set ACL entries cdist-type__acl - Basic wrapper around `setfacl`
DESCRIPTION DESCRIPTION
----------- -----------
Fully supported and tested on Linux (ext4 filesystem), partial support for FreeBSD. ACL must be defined as 3-symbol combination, using `r`, `w`, `x` and `-`.
See ``setfacl`` and ``acl`` manpages for more details. See setfacl(1) and acl(5) for more details.
REQUIRED MULTIPLE PARAMETERS OPTIONAL MULTIPLE PARAMETERS
---------------------------- ----------------------------
acl user
Set ACL entry following ``getfacl`` output syntax. Add user ACL entry.
group
Add group ACL entry.
BOOLEAN PARAMETERS BOOLEAN PARAMETERS
------------------ ------------------
default
Set all ACL entries as default too.
Only directories can have default ACLs.
Setting default ACL in FreeBSD is currently not supported.
recursive recursive
Make ``setfacl`` recursive (Linux only), but not ``getfacl`` in explorer. Operate recursively (Linux only).
default
Add default ACL entries.
remove remove
Remove undefined ACL entries. Remove undefined ACL entries (Solaris not supported).
``mask`` and ``other`` entries can't be removed, but only changed.
DEPRECATED PARAMETERS
---------------------
Parameters ``user``, ``group``, ``mask`` and ``other`` are deprecated and they
will be removed in future versions. Please use ``acl`` parameter instead.
EXAMPLES EXAMPLES
@ -46,30 +40,13 @@ EXAMPLES
.. code-block:: sh .. code-block:: sh
__acl /srv/project \ __acl /srv/project \
--default \
--recursive \ --recursive \
--remove \
--acl user:alice:rwx \
--acl user:bob:r-x \
--acl group:project-group:rwx \
--acl group:some-other-group:r-x \
--acl mask::r-x \
--acl other::r-x
# give Alice read-only access to subdir,
# but don't allow her to see parent content.
__acl /srv/project2 \
--remove \
--acl default:group:secret-project:rwx \
--acl group:secret-project:rwx \
--acl user:alice:--x
__acl /srv/project2/subdir \
--default \ --default \
--remove \ --remove \
--acl group:secret-project:rwx \ --user alice:rwx \
--acl user:alice:r-x --user bob:r-x \
--group project-group:rwx \
--group some-other-group:r-x
AUTHORS AUTHORS

View file

@ -1 +0,0 @@
see manual for details

View file

@ -1 +0,0 @@
see manual for details

View file

@ -1 +0,0 @@
see manual for details

View file

@ -1 +0,0 @@
see manual for details

View file

@ -1,2 +0,0 @@
mask
other

View file

@ -1,3 +1,2 @@
acl
user user
group group

View file

@ -27,18 +27,6 @@ else
keyid="$__object_id" keyid="$__object_id"
fi fi
keydir="$(cat "$__object/parameter/keydir")" apt-key export "$keyid" | head -n 1 | grep -Fqe "BEGIN PGP PUBLIC KEY BLOCK" \
keyfile="$keydir/$__object_id.gpg"
if [ -d "$keydir" ]
then
if [ -f "$keyfile" ]
then echo present
else echo absent
fi
else
# fallback to deprecated apt-key
apt-key export "$keyid" | head -n 1 | grep -Fqe "BEGIN PGP PUBLIC KEY BLOCK" \
&& echo present \ && echo present \
|| echo absent || echo absent
fi

View file

@ -31,84 +31,12 @@ if [ "$state_should" = "$state_is" ]; then
exit 0 exit 0
fi fi
keydir="$(cat "$__object/parameter/keydir")"
keyfile="$keydir/$__object_id.gpg"
case "$state_should" in case "$state_should" in
present) present)
keyserver="$(cat "$__object/parameter/keyserver")" keyserver="$(cat "$__object/parameter/keyserver")"
echo "apt-key adv --keyserver '$keyserver' --recv-keys '$keyid'"
if [ -f "$__object/parameter/uri" ]; then
uri="$(cat "$__object/parameter/uri")"
if [ -d "$keydir" ]; then
cat << EOF
curl -s -L \\
-o "$keyfile" \\
"$uri"
if grep -Fq 'BEGIN PGP PUBLIC KEY BLOCK' \\
"$keyfile"
then
cat "$keyfile" \\
| gpg --export > "$keyfile"
fi
EOF
else
# fallback to deprecated apt-key
echo "curl -s -L '$uri' | apt-key add -"
fi
elif [ -d "$keydir" ]; then
tmp='/tmp/cdist_apt_key_tmp'
# we need to kill gpg after 30 seconds, because gpg
# can get stuck if keyserver is not responding.
# exporting env var and not exit 1,
# because we need to clean up and kill dirmngr.
cat << EOF
mkdir -m 700 -p "$tmp"
if timeout 30s \\
gpg --homedir "$tmp" \\
--keyserver "$keyserver" \\
--recv-keys "$keyid"
then
gpg --homedir "$tmp" \\
--export "$keyid" \\
> "$keyfile"
else
export GPG_GOT_STUCK=1
fi
GNUPGHOME="$tmp" gpgconf --kill dirmngr
rm -rf "$tmp"
if [ -n "\$GPG_GOT_STUCK" ]
then
echo "GPG GOT STUCK - no response from keyserver after 30 seconds" >&2
exit 1
fi
EOF
else
# fallback to deprecated apt-key
echo "apt-key adv --keyserver \"$keyserver\" --recv-keys \"$keyid\""
fi
echo "added '$keyid'" >> "$__messages_out"
;; ;;
absent) absent)
if [ -f "$keyfile" ]; then echo "apt-key del '$keyid'"
echo "rm '$keyfile'"
else
# fallback to deprecated apt-key
echo "apt-key del \"$keyid\""
fi
echo "removed '$keyid'" >> "$__messages_out"
;; ;;
esac esac

View file

@ -28,12 +28,6 @@ keyserver
the keyserver from which to fetch the key. If omitted the default set the keyserver from which to fetch the key. If omitted the default set
in ./parameter/default/keyserver is used. in ./parameter/default/keyserver is used.
keydir
key save location, defaults to ``/etc/apt/trusted.pgp.d``
uri
the URI from which to download the key
EXAMPLES EXAMPLES
-------- --------
@ -53,20 +47,15 @@ EXAMPLES
# same thing with other keyserver # same thing with other keyserver
__apt_key UbuntuArchiveKey --keyid 437D05B5 --keyserver keyserver.ubuntu.com __apt_key UbuntuArchiveKey --keyid 437D05B5 --keyserver keyserver.ubuntu.com
# download key from the internet
__apt_key rabbitmq \
--uri http://www.rabbitmq.com/rabbitmq-signing-key-public.asc
AUTHORS AUTHORS
------- -------
Steven Armstrong <steven-cdist--@--armstrong.cc> Steven Armstrong <steven-cdist--@--armstrong.cc>
Ander Punnar <ander-at-kvlt-dot-ee>
COPYING COPYING
------- -------
Copyright \(C) 2011-2019 Steven Armstrong and Ander Punnar. You can Copyright \(C) 2011-2014 Steven Armstrong. You can redistribute it
redistribute it and/or modify it under the terms of the GNU General Public and/or modify it under the terms of the GNU General Public License as
License as published by the Free Software Foundation, either version 3 of the published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version. License, or (at your option) any later version.

View file

@ -1,8 +0,0 @@
#!/bin/sh -e
__package gnupg
if [ -f "$__object/parameter/uri" ]
then __package curl
else __package dirmngr
fi

View file

@ -1 +0,0 @@
/etc/apt/trusted.gpg.d

View file

@ -1,5 +1,3 @@
state state
keyid keyid
keyserver keyserver
keydir
uri

View file

@ -23,11 +23,10 @@
name="$__object_id" name="$__object_id"
# shellcheck disable=SC1091
. /etc/lsb-release . /etc/lsb-release
repo_name="${name#ppa:}" repo_name="${name#ppa:}"
repo_file_name="$(echo "$repo_name" | sed -e 's|[/:]|-|' -e 's|\.|_|')-${DISTRIB_CODENAME}.list" repo_file_name="$(echo "$repo_name" | sed -e "s|[/:]|-|" -e "s|\.|_|")-${DISTRIB_CODENAME}.list"
[ -s "/etc/apt/sources.list.d/${repo_file_name}" ] \ [ -s "/etc/apt/sources.list.d/${repo_file_name}" ] \
&& echo present || echo absent && echo present || echo absent

View file

@ -18,6 +18,8 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
# name="$__object_id"
__package software-properties-common __package software-properties-common
require="__package/software-properties-common" \ require="__package/software-properties-common" \

View file

@ -18,11 +18,6 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
# quote function from http://www.etalabs.net/sh_tricks.html
quote() {
printf '%s\n' "$1" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/'/"
}
file="$(cat "$__object/parameter/file" 2>/dev/null || echo "/$__object_id")" file="$(cat "$__object/parameter/file" 2>/dev/null || echo "/$__object_id")"
state_should=$(cat "$__object/parameter/state") state_should=$(cat "$__object/parameter/state")
prefix=$(cat "$__object/parameter/prefix" 2>/dev/null || echo "#cdist:__block/$__object_id") prefix=$(cat "$__object/parameter/prefix" 2>/dev/null || echo "#cdist:__block/$__object_id")
@ -51,7 +46,7 @@ tmpfile=\$(mktemp ${file}.cdist.XXXXXXXXXX)
if [ -f "$file" ]; then if [ -f "$file" ]; then
cp -p "$file" "\$tmpfile" cp -p "$file" "\$tmpfile"
fi fi
awk -v prefix=^$(quote "$prefix")\$ -v suffix=^$(quote "$suffix")\$ ' awk -v prefix="^$prefix\$" -v suffix="^$suffix\$" '
{ {
if (match(\$0,prefix)) { if (match(\$0,prefix)) {
triggered=1 triggered=1

View file

@ -18,6 +18,8 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
# file="$(cat "$__object/parameter/file" 2>/dev/null || echo "/$__object_id")"
prefix=$(cat "$__object/parameter/prefix" 2>/dev/null || echo "#cdist:__block/$__object_id") prefix=$(cat "$__object/parameter/prefix" 2>/dev/null || echo "#cdist:__block/$__object_id")
suffix=$(cat "$__object/parameter/suffix" 2>/dev/null || echo "#/cdist:__block/$__object_id") suffix=$(cat "$__object/parameter/suffix" 2>/dev/null || echo "#/cdist:__block/$__object_id")
text=$(cat "$__object/parameter/text") text=$(cat "$__object/parameter/text")

View file

@ -43,17 +43,17 @@ get_current_value() {
set_group() { set_group() {
echo "chgrp '$1' '$destination'" echo "chgrp '$1' '$destination'"
echo "chgrp '$1'" >> "$__messages_out" echo "chgrp $1" >> "$__messages_out"
} }
set_owner() { set_owner() {
echo "chown '$1' '$destination'" echo "chown '$1' '$destination'"
echo "chown '$1'" >> "$__messages_out" echo "chown $1" >> "$__messages_out"
} }
set_mode() { set_mode() {
echo "chmod '$1' '$destination'" echo "chmod '$1' '$destination'"
echo "chmod '$1'" >> "$__messages_out" echo "chmod $1" >> "$__messages_out"
} }
case "$state_should" in case "$state_should" in

View file

@ -22,7 +22,7 @@ name="$__object_id"
state="$(cat "$__object/parameter/state")" state="$(cat "$__object/parameter/state")"
source="$(cat "$__object/parameter/source")" source="$(cat "$__object/parameter/source")"
destination="$(cat "$__object/parameter/destination")" destination="$(cat "$__object/parameter/destination")"
ccollectconf="$(sed 's,/$,,' "$__object/parameter/ccollectconf")" ccollectconf="$(sed -E 's,/+$,,' "$__object/parameter/ccollectconf")"
sourcedir="$ccollectconf/sources" sourcedir="$ccollectconf/sources"
basedir="$sourcedir/$name" basedir="$sourcedir/$name"
@ -55,5 +55,5 @@ if [ -f "$__object/parameter/exclude" ]; then
fi fi
if [ -f "$__object/parameter/create-destination" ]; then if [ -f "$__object/parameter/create-destination" ]; then
__directory "${destination}" --parents --state "${state}" __directory "${destination}" --parents --state ${state}
fi fi

View file

@ -30,7 +30,7 @@ username
source source
Select the source from which to clone cdist from. Select the source from which to clone cdist from.
Defaults to "git@code.ungleich.ch:ungleich-public/cdist.git". Defaults to "git://github.com/ungleich/cdist.git".
branch branch
@ -47,7 +47,7 @@ EXAMPLES
__cdist /home/cdist/cdist __cdist /home/cdist/cdist
# Use alternative source # Use alternative source
__cdist --source "git@code.ungleich.ch:ungleich-public/cdist.git" /home/cdist/cdist __cdist --source "git://github.com/ungleich/cdist" /home/cdist/cdist
AUTHORS AUTHORS

View file

@ -1 +1 @@
git@code.ungleich.ch:ungleich-public/cdist.git git://github.com/ungleich/cdist.git

View file

@ -1,26 +0,0 @@
#!/bin/sh -e
#
# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
#
# This file is part of cdist.
#
# cdist is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# cdist is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
#
if grep -Eq \
"$( cat "$__object/parameter/pattern" )" \
"$__messages_in"
then
tee "$__messages_out" < "$__object/parameter/execute"
fi

View file

@ -1,52 +0,0 @@
cdist-type__check_messages(7)
=============================
NAME
----
cdist-type__check_messages - Check messages for pattern and execute command on match.
DESCRIPTION
-----------
Check messages for pattern and execute command on match.
This type is useful if you chain together multiple related types using
dependencies and want to restart service if at least one type changes
something.
For more information about messages see `cdist messaging <cdist-messaging.html>`_.
For more information about dependencies and execution order see
`cdist manifest <cdist-manifest.html#dependencies>`_ documentation.
REQUIRED PARAMETERS
-------------------
pattern
Extended regular expression pattern for search (passed to ``grep -E``).
execute
Command to execute on pattern match.
EXAMPLES
--------
.. code-block:: sh
__check_messages munin \
--pattern '^__(file|link|line)/etc/munin/' \
--execute 'service munin-node restart'
AUTHORS
-------
Ander Punnar <ander-at-kvlt-dot-ee>
COPYING
-------
Copyright \(C) 2019 Ander Punnar. 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.

View file

@ -1,2 +0,0 @@
pattern
execute

View file

@ -1,35 +0,0 @@
#!/bin/sh -e
#
# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
#
# 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/>.
#
path="/$__object_id"
[ ! -d "$path" ] && exit 0
pattern="$( cat "$__object/parameter/pattern" )"
if [ -f "$__object/parameter/exclude" ]
then
exclude="$( cat "$__object/parameter/exclude" )"
find "$path" -mindepth 1 -maxdepth 1 -regex "$pattern" \
-and -not -regex "$exclude"
else
find "$path" -mindepth 1 -maxdepth 1 -regex "$pattern"
fi

View file

@ -1,48 +0,0 @@
#!/bin/sh -e
#
# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
#
# 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/>.
#
[ ! -s "$__object/explorer/list" ] && exit 0
path="/$__object_id"
pattern="$( cat "$__object/parameter/pattern" )"
if [ -f "$__object/parameter/exclude" ]
then
exclude="$( cat "$__object/parameter/exclude" )"
echo "find '$path' -mindepth 1 -maxdepth 1 -regex '$pattern'" \
"-and -not -regex '$exclude'" \
'-exec rm -rf {} \;'
else
echo "find '$path' -mindepth 1 -maxdepth 1 -regex '$pattern'" \
'-exec rm -rf {} \;'
fi
while read -r f
do
echo "removed '$f'" >> "$__messages_out"
done \
< "$__object/explorer/list"
if [ -f "$__object/parameter/onchange" ]
then
cat "$__object/parameter/onchange"
fi

View file

@ -1,60 +0,0 @@
cdist-type__clean_path(7)
=========================
NAME
----
cdist-type__clean_path - Remove files and directories which match the pattern.
DESCRIPTION
-----------
Remove files and directories which match the pattern.
Provided path (as __object_id) must be a directory.
Patterns are passed to ``find``'s ``-regex`` - see ``find(1)`` for more details.
Look up of files and directories is non-recursive (``-maxdepth 1``).
Parent directory is excluded (``-mindepth 1``).
This type is not POSIX compatible (sorry, Solaris users).
REQUIRED PARAMETERS
-------------------
pattern
Pattern of files which are removed from path.
OPTIONAL PARAMETERS
-------------------
exclude
Pattern of files which are excluded from removal.
onchange
The code to run if files or directories were removed.
EXAMPLES
--------
.. code-block:: sh
__clean_path /etc/apache2/conf-enabled \
--pattern '.+' \
--exclude '.+\(charset\.conf\|security\.conf\)' \
--onchange 'service apache2 restart'
AUTHORS
-------
Ander Punnar <ander-at-kvlt-dot-ee>
COPYING
-------
Copyright \(C) 2019 Ander Punnar. 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.

View file

@ -1,2 +0,0 @@
exclude
onchange

View file

@ -1 +0,0 @@
pattern

View file

@ -19,8 +19,7 @@
# #
set -- "/${__object_id}" set -- "/${__object_id}"
cd "$__object/parameter/" for param in $(ls "$__object/parameter/"); do
for param in *; do
case "$param" in case "$param" in
source) source)
source="$(cat "$__object/parameter/source")" source="$(cat "$__object/parameter/source")"

View file

@ -1 +0,0 @@
191982 110369685

View file

@ -1 +0,0 @@
https://releases.hashicorp.com/consul/1.2.3/consul_1.2.3_linux_amd64.zip

View file

@ -1 +0,0 @@
1714523667 98363467 consul

View file

@ -1 +0,0 @@
https://releases.hashicorp.com/consul/1.3.0/consul_1.3.0_linux_amd64.zip

View file

@ -1 +0,0 @@
886614099 103959898 consul

View file

@ -1 +0,0 @@
https://releases.hashicorp.com/consul/1.5.0/consul_1.5.0_linux_amd64.zip

View file

@ -39,10 +39,10 @@ version_dir="$versions_dir/$version"
source=$(cat "$version_dir/source") source=$(cat "$version_dir/source")
source_file_name="${source##*/}" source_file_name="${source##*/}"
cksum_should=$(cut -d' ' -f1,2 "$version_dir/cksum") cksum_should=$(cat "$version_dir/cksum" | cut -d' ' -f1,2)
cat << eof cat << eof
tmpdir=\$(mktemp -d -p /tmp "${__type##*/}.XXXXXXXXXX") tmpdir=\$(mktemp -d --tmpdir="/tmp" "${__type##*/}.XXXXXXXXXX")
curl -s -L "$source" > "\$tmpdir/$source_file_name" curl -s -L "$source" > "\$tmpdir/$source_file_name"
unzip -p "\$tmpdir/$source_file_name" > "${destination}.tmp" unzip -p "\$tmpdir/$source_file_name" > "${destination}.tmp"
rm -rf "\$tmpdir" rm -rf "\$tmpdir"

View file

@ -24,7 +24,7 @@
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
case "$os" in case "$os" in
alpine|scientific|centos|redhat|ubuntu|debian|devuan|archlinux|gentoo) scientific|centos|redhat|ubuntu|debian|devuan|archlinux|gentoo)
# any linux should work # any linux should work
: :
;; ;;
@ -47,7 +47,6 @@ fi
if [ -f "$__object/parameter/direct" ]; then if [ -f "$__object/parameter/direct" ]; then
__package unzip __package unzip
__package curl
else else
__staged_file /usr/local/bin/consul \ __staged_file /usr/local/bin/consul \
--source "$(cat "$version_dir/source")" \ --source "$(cat "$version_dir/source")" \

View file

@ -1,38 +0,0 @@
#!/sbin/openrc-run
# 2019 Nico Schottelius (nico-cdist at schottelius.org)
description="consul agent"
pidfile="${CONSUL_PIDFILE:-"/var/run/$RC_SVCNAME/pidfile"}"
command="${CONSUL_BINARY:-"/usr/local/bin/consul"}"
checkconfig() {
if [ ! -d /var/run/consul ] ; then
mkdir -p /var/run/consul || return 1
chown consul:consul /var/run/$NAME || return 1
chmod 2770 /var/run/$NAME || return 1
fi
}
start() {
need net
start-stop-daemon --start --quiet --oknodo \
--pidfile "$pidfile" --background \
--exec $command -- agent -pid-file="$pidfile" -config-dir /etc/consul/conf.d
}
start_pre() {
checkconfig
}
stop() {
if [ "${RC_CMD}" = "restart" ] ; then
checkconfig || return 1
fi
ebegin "Stopping $RC_SVCNAME"
start-stop-daemon --stop --exec "$command" \
--pidfile "$pidfile" --quiet
eend $?
}

View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# 2015-2018 Nico Schottelius (nico-cdist at schottelius.org) # 2015 Nico Schottelius (nico-cdist at schottelius.org)
# 2015 Steven Armstrong (steven-cdist at armstrong.cc) # 2015 Steven Armstrong (steven-cdist at armstrong.cc)
# #
# This file is part of cdist. # This file is part of cdist.
@ -24,18 +24,15 @@
# Required-Stop: $local_fs # Required-Stop: $local_fs
# Should-Start: # Should-Start:
# Should-Stop: # Should-Stop:
# Short-Description: consul
# Description: consul agent
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: libvirt management daemon
### END INIT INFO ### END INIT INFO
if [ -f "/etc/default/consul" ]; then if [ -f "/etc/default/consul" ]; then
# shellcheck disable=SC1091
. /etc/default/consul . /etc/default/consul
fi fi
# shellcheck disable=SC1091
. /lib/lsb/init-functions . /lib/lsb/init-functions
NAME=consul NAME=consul

View file

@ -11,52 +11,49 @@
# pidfile: /var/run/consul/pidfile # pidfile: /var/run/consul/pidfile
# Source function library. # Source function library.
# shellcheck disable=SC1091
. /etc/init.d/functions . /etc/init.d/functions
NAME=consul NAME=consul
CONSUL=/usr/local/bin/consul CONSUL=/usr/local/bin/consul
CONFIG="/etc/$NAME/conf.d" CONFIG=/etc/$NAME/conf.d
PID_FILE="/var/run/$NAME/pidfile" PID_FILE=/var/run/$NAME/pidfile
LOG_FILE="/var/log/$NAME" LOG_FILE=/var/log/$NAME
# shellcheck disable=SC1090 [ -e /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
[ -e "/etc/sysconfig/$NAME" ] && . "/etc/sysconfig/$NAME" export GOMAXPROCS=${GOMAXPROCS:-2}
export GOMAXPROCS="${GOMAXPROCS:-2}"
mkdir -p "/var/run/$NAME" mkdir -p /var/run/$NAME
chown consul:consul "/var/run/$NAME" chown consul:consul /var/run/$NAME
chmod 2770 "/var/run/$NAME" chmod 2770 /var/run/$NAME
start() { start() {
printf "Starting %s: " "$NAME" echo -n "Starting $NAME: "
daemon --user=consul \ daemon --user=consul \
--pidfile="$PID_FILE" \ --pidfile="$PID_FILE" \
"$CONSUL" agent -pid-file="$PID_FILE" -config-dir "$CONFIG" >> "$LOG_FILE" & "$CONSUL" agent -pid-file="$PID_FILE" -config-dir "$CONFIG" >> "$LOG_FILE" &
retcode=$? retcode=$?
touch "/var/lock/subsys/$NAME" touch /var/lock/subsys/$NAME
return "$retcode" return $retcode
} }
stop() { stop() {
printf "Shutting down %s: " "$NAME" echo -n "Shutting down $NAME: "
killproc -p "$PID_FILE" "$NAME" killproc -p "$PID_FILE" $NAME
retcode=$? retcode=$?
rm -f "/var/lock/subsys/$NAME" rm -f /var/lock/subsys/$NAME
return "$retcode" return $retcode
} }
case "$1" in case "$1" in
start) start)
if status -p "$PID_FILE" "$NAME" >/dev/null; then if $(status -p "$PID_FILE" $NAME >/dev/null); then
echo "$NAME already running" echo "$NAME already running"
else else
start start
fi fi
;; ;;
stop) stop)
if status -p "$PID_FILE" "$NAME" >/dev/null; then if $(status -p "$PID_FILE" $NAME >/dev/null); then
stop stop
else else
echo "$NAME not running" echo "$NAME not running"
@ -66,25 +63,25 @@ case "$1" in
"$CONSUL" info "$CONSUL" info
;; ;;
status) status)
status -p "$PID_FILE" "$NAME" status -p "$PID_FILE" $NAME
exit $? exit $?
;; ;;
restart) restart)
if status -p "$PID_FILE" "$NAME" >/dev/null; then if $(status -p "$PID_FILE" $NAME >/dev/null); then
stop stop
fi fi
start start
;; ;;
reload) reload)
if status -p "$PID_FILE" "$NAME" >/dev/null; then if $(status -p "$PID_FILE" $NAME >/dev/null); then
kill -HUP "$(cat "$PID_FILE")" kill -HUP `cat $PID_FILE`
else else
echo "$NAME not running" echo "$NAME not running"
fi fi
;; ;;
condrestart) condrestart)
if [ -f "/var/lock/subsys/$NAME" ]; then if [ -f /var/lock/subsys/$NAME ]; then
if status -p "$PID_FILE" "$NAME" >/dev/null; then if $(status -p "$PID_FILE" $NAME >/dev/null); then
stop stop
fi fi
start start

View file

@ -1,7 +1,7 @@
#!/bin/sh -e #!/bin/sh -e
# #
# 2015 Steven Armstrong (steven-cdist at armstrong.cc) # 2015 Steven Armstrong (steven-cdist at armstrong.cc)
# 2015-2019 Nico Schottelius (nico-cdist at schottelius.org) # 2015 Nico Schottelius (nico-cdist at schottelius.org)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -23,7 +23,7 @@
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
case "$os" in case "$os" in
alpine|scientific|centos|debian|devuan|redhat|ubuntu) scientific|centos|debian|devuan|redhat|ubuntu)
# whitelist safeguard # whitelist safeguard
: :
;; ;;
@ -84,8 +84,7 @@ echo "{"
# parameters we define ourself # parameters we define ourself
printf ' "data_dir": "%s"\n' "$data_dir" printf ' "data_dir": "%s"\n' "$data_dir"
cd "$__object/parameter/" for param in $(ls "$__object/parameter/"); do
for param in *; do
case "$param" in case "$param" in
state|user|group|json-config) continue ;; state|user|group|json-config) continue ;;
ca-file-source|cert-file-source|key-file-source) ca-file-source|cert-file-source|key-file-source)
@ -181,9 +180,6 @@ init_upstart()
# Install init script to start on boot # Install init script to start on boot
case "$os" in case "$os" in
alpine|devuan)
init_sysvinit debian
;;
centos|redhat) centos|redhat)
os_version="$(sed 's/[^0-9.]//g' "$__global/explorer/os_version")" os_version="$(sed 's/[^0-9.]//g' "$__global/explorer/os_version")"
major_version="${os_version%%.*}" major_version="${os_version%%.*}"
@ -209,7 +205,7 @@ case "$os" in
[567]) [567])
init_sysvinit debian init_sysvinit debian
;; ;;
[89]) 8)
init_systemd init_systemd
;; ;;
*) *)
@ -219,6 +215,10 @@ case "$os" in
esac esac
;; ;;
devuan)
init_sysvinit debian
;;
ubuntu) ubuntu)
init_upstart init_upstart
;; ;;

View file

@ -50,8 +50,7 @@ fi
echo "{" echo "{"
printf ' "check": {\n' printf ' "check": {\n'
printf ' "name": "%s"\n' "$name" printf ' "name": "%s"\n' "$name"
cd "$__object/parameter/" for param in $(ls "$__object/parameter/"); do
for param in *; do
case "$param" in case "$param" in
state|name) continue ;; state|name) continue ;;
*) *)

View file

@ -42,8 +42,7 @@ fi
echo "{" echo "{"
printf ' "service": {\n' printf ' "service": {\n'
printf ' "name": "%s"\n' "$name" printf ' "name": "%s"\n' "$name"
cd "$__object/parameter/" for param in $(ls "$__object/parameter/"); do
for param in *; do
case "$param" in case "$param" in
state|name|check-interval) continue ;; state|name|check-interval) continue ;;
check-script) check-script)

View file

@ -10,75 +10,72 @@
# pidfile: /var/run/consul-template/pidfile # pidfile: /var/run/consul-template/pidfile
# Source function library. # Source function library.
# shellcheck disable=SC1091
. /etc/init.d/functions . /etc/init.d/functions
NAME=consul-template NAME=consul-template
CONSUL_TEMPLATE=/usr/local/bin/consul-template CONSUL_TEMPLATE=/usr/local/bin/consul-template
CONFIG="/etc/$NAME/conf.d" CONFIG=/etc/$NAME/conf.d
PID_FILE="/var/run/$NAME/pidfile" PID_FILE=/var/run/$NAME/pidfile
LOG_FILE="/var/log/$NAME" LOG_FILE=/var/log/$NAME
# shellcheck disable=SC1090 [ -e /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
[ -e "/etc/sysconfig/$NAME" ] && . "/etc/sysconfig/$NAME" export CONSUL_TEMPLATE_LOG=${CONSUL_TEMPLATE_LOG:-info}
export CONSUL_TEMPLATE_LOG="${CONSUL_TEMPLATE_LOG:-info}" export GOMAXPROCS=${GOMAXPROCS:-2}
export GOMAXPROCS="${GOMAXPROCS:-2}"
mkdir -p "/var/run/$NAME" mkdir -p /var/run/$NAME
start() { start() {
printf "Starting %s: " "$NAME" echo -n "Starting $NAME: "
daemon --pidfile="$PID_FILE" \ daemon --pidfile="$PID_FILE" \
"$CONSUL_TEMPLATE" -config "$CONFIG" >> "$LOG_FILE" 2>&1 & "$CONSUL_TEMPLATE" -config "$CONFIG" >> "$LOG_FILE" 2>&1 &
echo "$!" > "$PID_FILE" echo $! > "$PID_FILE"
retcode=$? retcode=$?
touch "/var/lock/subsys/$NAME" touch /var/lock/subsys/$NAME
return "$retcode" return $retcode
} }
stop() { stop() {
printf "Shutting down %s: " "$NAME" echo -n "Shutting down $NAME: "
killproc -p "$PID_FILE" "$CONSUL_TEMPLATE" killproc -p $PID_FILE $CONSUL_TEMPLATE
retcode=$? retcode=$?
rm -f "/var/lock/subsys/$NAME" rm -f /var/lock/subsys/$NAME
return "$retcode" return $retcode
} }
case "$1" in case "$1" in
start) start)
if status -p "$PID_FILE" "$NAME" >/dev/null; then if $(status -p "$PID_FILE" $NAME >/dev/null); then
echo "$NAME already running" echo "$NAME already running"
else else
start start
fi fi
;; ;;
stop) stop)
if status -p "$PID_FILE" "$NAME" >/dev/null; then if $(status -p "$PID_FILE" $NAME >/dev/null); then
stop stop
else else
echo "$NAME not running" echo "$NAME not running"
fi fi
;; ;;
status) status)
status -p "$PID_FILE" "$NAME" status -p "$PID_FILE" $NAME
exit $? exit $?
;; ;;
restart) restart)
if status -p "$PID_FILE" "$NAME" >/dev/null; then if $(status -p "$PID_FILE" $NAME >/dev/null); then
stop stop
fi fi
start start
;; ;;
reload) reload)
if status -p "$PID_FILE" "$NAME" >/dev/null; then if $(status -p "$PID_FILE" $NAME >/dev/null); then
kill -HUP "$(cat "$PID_FILE")" kill -HUP `cat $PID_FILE`
else else
echo "$NAME not running" echo "$NAME not running"
fi fi
;; ;;
condrestart) condrestart)
if [ -f "/var/lock/subsys/$NAME" ]; then if [ -f /var/lock/subsys/$NAME ]; then
if status -p "$PID_FILE" "$NAME" >/dev/null; then if $(status -p "$PID_FILE" $NAME >/dev/null); then
stop stop
fi fi
start start

View file

@ -75,8 +75,7 @@ require="__directory/etc/consul-template" \
# Generate hcl config file # Generate hcl config file
( (
cd "$__object/parameter/" for param in $(ls "$__object/parameter/"); do
for param in *; do
case "$param" in case "$param" in
auth-password|state|ssl-*|syslog-*|version|vault-token|vault-ssl*) continue ;; auth-password|state|ssl-*|syslog-*|version|vault-token|vault-ssl*) continue ;;
auth-username) auth-username)

View file

@ -35,27 +35,23 @@ if [ ! -f "$__object/parameter/source" ] && [ ! -f "$__object/parameter/source-f
exit 1 exit 1
fi fi
if [ -f "$__object/parameter/source-file" ]; then
destination="${template_dir}/${name}"
require="__file${destination}"
fi
# Generate hcl config file # Generate hcl config file
{ (
printf 'template {\n' printf 'template {\n'
cd "$__object/parameter/" for param in $(ls "$__object/parameter/"); do
for param in *; do
case "$param" in case "$param" in
source-file) source-file)
source="$(cat "$__object/parameter/$param")" source="$(cat "$__object/parameter/$param")"
if [ "$source" = "-" ]; then if [ "$source" = "-" ]; then
source="$__object/stdin" source="$__object/stdin"
fi fi
destination="${template_dir}/${name}"
require="__directory${template_dir}" \ require="__directory${template_dir}" \
__file "$destination" \ __file "$destination" \
--owner root --group root --mode 640 \ --owner root --group root --mode 640 \
--source "$source" \ --source "$source" \
--state "$state" --state "$state"
export require="__file${destination}"
printf ' source = "%s"\n' "$destination" printf ' source = "%s"\n' "$destination"
;; ;;
@ -69,7 +65,7 @@ for param in *; do
esac esac
done done
printf '}\n' printf '}\n'
} | \ ) | \
require="$require __directory${conf_dir}" \ require="$require __directory${conf_dir}" \
__config_file "${conf_dir}/${conf_file}" \ __config_file "${conf_dir}/${conf_file}" \
--owner root --group root --mode 640 \ --owner root --group root --mode 640 \

View file

@ -35,8 +35,7 @@ fi
echo "{" echo "{"
printf ' "watches": [{\n' printf ' "watches": [{\n'
printf ' "type": "%s"\n' "$watch_type" printf ' "type": "%s"\n' "$watch_type"
cd "$__object/parameter/" for param in $(ls "$__object/parameter/"); do
for param in *; do
case "$param" in case "$param" in
state) continue ;; state) continue ;;
filter-*) filter-*)

View file

@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
echo "{" echo "{"
printf ' "watches": [{\n' printf ' "watches": [{\n'
printf ' "type": "%s"\n' "$watch_type" printf ' "type": "%s"\n' "$watch_type"
cd "$__object/parameter/" for param in $(ls "$__object/parameter/"); do
for param in *; do
case "$param" in case "$param" in
state) continue ;; state) continue ;;
*) *)

View file

@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
echo "{" echo "{"
printf ' "watches": [{\n' printf ' "watches": [{\n'
printf ' "type": "%s"\n' "$watch_type" printf ' "type": "%s"\n' "$watch_type"
cd "$__object/parameter/" for param in $(ls "$__object/parameter/"); do
for param in *; do
case "$param" in case "$param" in
state) continue ;; state) continue ;;
*) *)

View file

@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
echo "{" echo "{"
printf ' "watches": [{\n' printf ' "watches": [{\n'
printf ' "type": "%s"\n' "$watch_type" printf ' "type": "%s"\n' "$watch_type"
cd "$__object/parameter/" for param in $(ls "$__object/parameter/"); do
for param in *; do
case "$param" in case "$param" in
state) continue ;; state) continue ;;
*) *)

View file

@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
echo "{" echo "{"
printf ' "watches": [{\n' printf ' "watches": [{\n'
printf ' "type": "%s"\n' "$watch_type" printf ' "type": "%s"\n' "$watch_type"
cd "$__object/parameter/" for param in $(ls "$__object/parameter/"); do
for param in *; do
case "$param" in case "$param" in
state) continue ;; state) continue ;;
*) *)

View file

@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
echo "{" echo "{"
printf ' "watches": [{\n' printf ' "watches": [{\n'
printf ' "type": "%s"\n' "$watch_type" printf ' "type": "%s"\n' "$watch_type"
cd "$__object/parameter/" for param in $(ls "$__object/parameter/"); do
for param in *; do
case "$param" in case "$param" in
state) continue ;; state) continue ;;
passingonly) passingonly)

View file

@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
echo "{" echo "{"
printf ' "watches": [{\n' printf ' "watches": [{\n'
printf ' "type": "%s"\n' "$watch_type" printf ' "type": "%s"\n' "$watch_type"
cd "$__object/parameter/" for param in $(ls "$__object/parameter/"); do
for param in *; do
case "$param" in case "$param" in
state) continue ;; state) continue ;;
*) *)

View file

@ -58,9 +58,9 @@ state_should="$(cat "$__object/parameter/state" 2>/dev/null || echo "present")"
# These are the old markers # These are the old markers
prefix="#cdist:__cron/$__object_id" prefix="#cdist:__cron/$__object_id"
suffix="#/cdist:__cron/$__object_id" suffix="#/cdist:__cron/$__object_id"
filter='^# DO NOT EDIT THIS FILE|^# \(.* installed on |^# \(Cron version V|^# \(Cronie version .\..\)$' filter="^# DO NOT EDIT THIS FILE|^# \(.* installed on |^# \(Cron version V|^# \(Cronie version .\..\)$"
cat << DONE cat << DONE
crontab -u $user -l 2>/dev/null | grep -v -E "$filter" | awk -v prefix="$prefix" -v suffix="$suffix" ' crontab -u '$user' -l 2>/dev/null | grep -v -E "$filter" | awk -v prefix="$prefix" -v suffix="$suffix" '
{ {
if (index(\$0,prefix)) { if (index(\$0,prefix)) {
triggered=1 triggered=1
@ -73,24 +73,30 @@ crontab -u $user -l 2>/dev/null | grep -v -E "$filter" | awk -v prefix="$prefix"
print print
} }
} }
' | crontab -u $user - ' | crontab -u '$user' -
DONE DONE
case "$state_should" in case "$state_should" in
present) present)
# if we insert new entry, filter also all entrys out with the same id # if we insert new entry, filter also all entrys out with the same id
echo "(" cat <<EOF
echo "crontab -u $user -l 2>/dev/null | grep -v -E \"$filter\" | grep -v \"# $name\\$\" 2>/dev/null || true" (
echo "echo '$entry'" crontab -u '$user' -l 2>/dev/null | grep -v -E '$filter' | grep -v '# $name\\$' 2>/dev/null || true
echo ") | crontab -u $user -" echo '$entry'
) | crontab -u '$user' -
EOF
;; ;;
absent) absent)
if [ -f "$__object/parameter/raw_command" ]; then if [ -f "$__object/parameter/raw_command" ]; then
echo "( crontab -u $user -l 2>/dev/null | grep -v -E \"$filter\" 2>/dev/null || true ) | \\" cat <<EOF
echo "grep -v \"^$entry\\$\" | crontab -u $user -" ( crontab -u '$user' -l 2>/dev/null | grep -v -E '$filter' 2>/dev/null || true ) | \\
grep -v '^$entry\\$' | crontab -u '$user' -
EOF
else else
echo "( crontab -u $user -l 2>/dev/null | grep -v -E \"$filter\" 2>/dev/null || true ) | \\" cat <<EOF
echo "grep -v \"# $name\\$\" | crontab -u $user -" ( crontab -u '$user' -l 2>/dev/null | grep -v -E '$filter' 2>/dev/null || true ) | \\
grep -v '# $name\\$' | crontab -u '$user' -
EOF
fi fi
;; ;;
esac esac

View file

@ -23,9 +23,9 @@ fi
case "$1" in case "$1" in
start) start)
printf "Starting daemontools: " echo -n "Starting daemontools: "
if ! pidof svscan > /dev/null 2>&1; then if [ ! `pidof svscan` ]; then
printf "svscan " echo -n "svscan "
env - PATH="$PATH" svscan /service 2>&1 | setuidgid daemon multilog t /var/log/svscan & env - PATH="$PATH" svscan /service 2>&1 | setuidgid daemon multilog t /var/log/svscan &
echo "." echo "."
else else
@ -33,28 +33,23 @@ case "$1" in
fi fi
;; ;;
stop) stop)
printf "Stopping daemontools: " echo -n "Stopping daemontools: "
pids="$(pidof svscan)" if [ `pidof svscan` ]; then
if [ -n "${pids}" ] echo -n "svscan"
then while [ `pidof svscan` ]; do
printf "svscan" kill `pidof svscan`
while [ -n "${pids}" ] echo -n "."
do
# shellcheck disable=SC2086
kill ${pids}
printf "."
pids="$(pidof svscan)"
done done
fi fi
printf " services" echo -n " services"
for i in /service/*; do for i in `ls -d /service/*`; do
svc -dx "$i" svc -dx $i
printf "." echo -n "."
done done
printf " logging " echo -n " logging "
for i in /service/*/log; do for i in `ls -d /service/*/log`; do
svc -dx "$i" svc -dx $i
printf "." echo -n "."
done done
echo "" echo ""
;; ;;

View file

@ -9,7 +9,6 @@ __directory "$servicedir" --mode 700
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
init=$(cat "$__global/explorer/init") init=$(cat "$__global/explorer/init")
require=""
case $os in case $os in
freebsd) freebsd)
# TODO change to __start_on_boot once it supports freebsd # TODO change to __start_on_boot once it supports freebsd

1
cdist/conf/type/__daemontools_service/explorer/svc Executable file → Normal file
View file

@ -1,2 +1 @@
#!/bin/sh
command -v svc || true command -v svc || true

View file

@ -25,48 +25,20 @@ destination="/$__object_id"
os=$("$__explorer/os") os=$("$__explorer/os")
case "$os" in case "$os" in
"freebsd"|"netbsd"|"openbsd"|"macosx") "freebsd"|"netbsd"|"openbsd")
stat -f "type: %HT # FIXME: should be something like this based on man page, but can not test
stat -f "type: %ST
owner: %Du %Su owner: %Du %Su
group: %Dg %Sg group: %Dg %Sg
mode: %Lp %Sp mode: %Op %Sp
" "$destination" | awk '/^type/ { print tolower($0); next; } { print; }'
;;
alpine)
stat -c "type: %F
owner: %u %U
group: %g %G
mode: %a %A
" "$destination" " "$destination"
;; ;;
solaris) "macosx")
ls1="$( ls -ld "$destination" )" stat -f "type: %HT
ls2="$( ls -ldn "$destination" )" owner: %Du %Su
group: %Dg %Sg
if [ -f "$__object/parameter/mode" ] mode: %Lp %Sp
then mode_should="$( cat "$__object/parameter/mode" )" " "$destination"
fi
# yes, it is ugly hack, but if you know better way...
if [ -z "$( find "$destination" -perm "$mode_should" )" ]
then octets=888
else octets="$( echo "$mode_should" | sed 's/^0//' )"
fi
case "$( echo "$ls1" | cut -c1-1 )" in
-) echo 'type: regular file' ;;
d) echo 'type: directory' ;;
esac
echo "owner: $( echo "$ls2" \
| awk '{print $3}' ) $( echo "$ls1" \
| awk '{print $3}' )"
echo "group: $( echo "$ls2" \
| awk '{print $4}' ) $( echo "$ls1" \
| awk '{print $4}' )"
echo "mode: $octets $( echo "$ls1" | awk '{print $1}' )"
;; ;;
*) *)
stat --printf="type: %F stat --printf="type: %F

View file

@ -57,18 +57,18 @@ get_current_value() {
} }
set_group() { set_group() {
echo "chgrp $recursive '$1' '$destination'" echo "chgrp '$recursive' '$1' '$destination'"
echo "chgrp $recursive '$1'" >> "$__messages_out" echo "chgrp $recursive $1" >> "$__messages_out"
} }
set_owner() { set_owner() {
echo "chown $recursive '$1' '$destination'" echo "chown '$recursive' '$1' '$destination'"
echo "chown $recursive '$1'" >> "$__messages_out" echo "chown $recursive $1" >> "$__messages_out"
} }
set_mode() { set_mode() {
echo "chmod $recursive '$1' '$destination'" echo "chmod '$recursive' '$1' '$destination'"
echo "chmod $recursive '$1'" >> "$__messages_out" echo "chmod $recursive $1" >> "$__messages_out"
} }
case "$state_should" in case "$state_should" in

View file

@ -20,9 +20,6 @@ OPTIONAL PARAMETERS
------------------- -------------------
state state
'present' or 'absent', defaults to 'present' 'present' or 'absent', defaults to 'present'
version
The specific version to install. Defaults to the special value 'latest',
meaning the version the package manager will install by default.
BOOLEAN PARAMETERS BOOLEAN PARAMETERS
@ -41,8 +38,6 @@ EXAMPLES
# Remove docker # Remove docker
__docker --state absent __docker --state absent
# Install specific version
__docker --state present --version 18.03.0.ce
AUTHORS AUTHORS
------- -------

View file

@ -21,24 +21,18 @@
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
state=$(cat "$__object/parameter/state") state=$(cat "$__object/parameter/state")
version=$(cat "$__object/parameter/version")
case "$os" in case "$os" in
centos) centos)
# shellcheck source=/dev/null if (source "$__global/explorer/os_release" && [ "${VERSION_ID}" = "7" ]); then
if (. "$__global/explorer/os_release" && [ "${VERSION_ID}" = "7" ]); then
__yum_repo docker-ce-stable \ __yum_repo docker-ce-stable \
--name 'Docker CE Stable' \ --name 'Docker CE Stable' \
--baseurl "https://download.docker.com/linux/centos/7/\$basearch/stable" \ --baseurl "https://download.docker.com/linux/centos/7/\$basearch/stable" \
--enabled \ --enabled \
--gpgcheck 1 \ --gpgcheck 1 \
--gpgkey 'https://download.docker.com/linux/centos/gpg' \ --gpgkey 'https://download.docker.com/linux/centos/gpg' \
--state "${state}" --state ${state}
if [ "$version" != "latest" ]; then require="__yum_repo/docker-ce-stable" __package docker-ce --state ${state}
require="__yum_repo/docker-ce-stable" __package docker-ce --version "${version}" --state "${state}"
else
require="__yum_repo/docker-ce-stable" __package docker-ce --state "${state}"
fi
else else
echo "CentOS version 7 is required!" >&2 echo "CentOS version 7 is required!" >&2
exit 1 exit 1
@ -51,55 +45,15 @@ case "$os" in
__package gnupg2 __package gnupg2
fi fi
__apt_key_uri docker --name "Docker Release (CE deb) <docker@docker.com>" \ __apt_key_uri docker --name "Docker Release (CE deb) <docker@docker.com>" \
--uri "https://download.docker.com/linux/${os}/gpg" --state "${state}" --uri "https://download.docker.com/linux/${os}/gpg" --state ${state}
export CDIST_ORDER_DEPENDENCY=on
require="__apt_key_uri/docker" __apt_source docker \ __apt_source docker \
--uri "https://download.docker.com/linux/${os}" \ --uri "https://download.docker.com/linux/${os}" \
--distribution "$(cat "$__global/explorer/lsb_codename")" \ --distribution "$(cat "$__global/explorer/lsb_codename")" \
--state "${state}" \ --state ${state} \
--component "stable" --component "stable"
if [ "$version" != "latest" ]; then __package docker-ce --state ${state}
require="__apt_source/docker" __package docker-ce --version "${version}" --state "${state}" unset CDIST_ORDER_DEPENDENCY
else
require="__apt_source/docker" __package docker-ce --state "${state}"
fi
;;
devuan)
os_version="$(cat "$__global/explorer/os_version")"
case "$os_version" in
ascii)
distribution="stretch"
;;
jessie)
distribution="jessie"
;;
*)
echo "Your devuan release ($os_version) is currently not supported by this type (${__type##*/}).">&2
echo "Please contribute an implementation for it if you can." >&2
exit 1
;;
esac
if [ "${state}" = "present" ]; then
__package apt-transport-https
__package ca-certificates
__package gnupg2
fi
__apt_key_uri docker --name "Docker Release (CE deb) <docker@docker.com>" \
--uri "https://download.docker.com/linux/${os}/gpg" --state "${state}"
require="__apt_key_uri/docker" __apt_source docker \
--uri "https://download.docker.com/linux/${os}" \
--distribution "${distribution}" \
--state "${state}" \
--component "stable"
if [ "$version" != "latest" ]; then
require="__apt_source/docker" __package docker-ce --version "${version}" --state "${state}"
else
require="__apt_source/docker" __package docker-ce --state "${state}"
fi
;; ;;
*) *)
echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2 echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2

View file

@ -1 +0,0 @@
latest

View file

@ -1,2 +1 @@
state state
version

View file

@ -24,8 +24,7 @@ state="$(cat "$__object/parameter/state")"
if [ "${state}" = "present" ]; then if [ "${state}" = "present" ]; then
# Download docker-compose file # Download docker-compose file
#shellcheck disable=SC2016 echo "curl -L 'https://github.com/docker/compose/releases/download/${version}/docker-compose-$(uname -s)-$(uname -m)' -o /tmp/docker-compose"
echo 'curl -L "https://github.com/docker/compose/releases/download/'"${version}"'/docker-compose-$(uname -s)-$(uname -m)" -o /tmp/docker-compose'
echo 'mv /tmp/docker-compose /usr/local/bin/docker-compose' echo 'mv /tmp/docker-compose /usr/local/bin/docker-compose'
# Change permissions # Change permissions
echo 'chmod +x /usr/local/bin/docker-compose' echo 'chmod +x /usr/local/bin/docker-compose'

View file

@ -18,4 +18,4 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
docker info 2>/dev/null | grep '^ *Swarm: ' | awk '{print $2}' docker info 2>/dev/null | grep "^Swarm: " | cut -d " " -f 2-

View file

@ -19,7 +19,7 @@ set -eu
user="$(cat "${__object}/parameter/user")" user="$(cat "${__object}/parameter/user")"
if command -v getent >/dev/null 2>&1; then if which getent >/dev/null 2>&1; then
line=$(getent passwd "${user}") line=$(getent passwd "${user}")
else else
line=$(grep "^${user}:" /etc/passwd) line=$(grep "^${user}:" /etc/passwd)

View file

@ -1,7 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# 2013 Steven Armstrong (steven-cdist armstrong.cc) # 2013 Steven Armstrong (steven-cdist armstrong.cc)
# 2019 Nico Schottelius (nico-cdist at schottelius.org)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -26,56 +25,25 @@ destination="/$__object_id"
os=$("$__explorer/os") os=$("$__explorer/os")
case "$os" in case "$os" in
"freebsd"|"netbsd"|"openbsd"|"macosx") "freebsd"|"netbsd"|"openbsd")
# FIXME: should be something like this based on man page, but can not test
stat -f "type: %ST
owner: %Du %Su
group: %Dg %Sg
mode: %Op %Sp
size: %Dz
links: %Dl
" "$destination"
;;
"macosx")
stat -f "type: %HT stat -f "type: %HT
owner: %Du %Su owner: %Du %Su
group: %Dg %Sg group: %Dg %Sg
mode: %Lp %Sp mode: %Lp %Sp
size: %Dz size: %Dz
links: %Dl links: %Dl
" "$destination" | awk '/^type/ { print tolower($0); next; } { print; }'
;;
alpine)
# busybox stat
stat -c "type: %F
owner: %u %U
group: %g %G
mode: %a %A
size: %s
links: %h
" "$destination" " "$destination"
;; ;;
solaris)
ls1="$( ls -ld "$destination" )"
ls2="$( ls -ldn "$destination" )"
if [ -f "$__object/parameter/mode" ]
then mode_should="$( cat "$__object/parameter/mode" )"
fi
# yes, it is ugly hack, but if you know better way...
if [ -z "$( find "$destination" -perm "$mode_should" )" ]
then octets=888
else octets="$( echo "$mode_should" | sed 's/^0//' )"
fi
case "$( echo "$ls1" | cut -c1-1 )" in
-) echo 'type: regular file' ;;
d) echo 'type: directory' ;;
esac
echo "owner: $( echo "$ls2" \
| awk '{print $3}' ) $( echo "$ls1" \
| awk '{print $3}' )"
echo "group: $( echo "$ls2" \
| awk '{print $4}' ) $( echo "$ls1" \
| awk '{print $4}' )"
echo "mode: $octets $( echo "$ls1" | awk '{print $1}' )"
echo "size: $( echo "$ls1" | awk '{print $5}' )"
echo "links: $( echo "$ls1" | awk '{print $2}' )"
;;
*) *)
stat --printf="type: %F stat --printf="type: %F
owner: %u %U owner: %u %U

View file

@ -54,7 +54,7 @@ if [ "$state_should" = "present" ] || [ "$state_should" = "exists" ]; then
source="$__object/stdin" source="$__object/stdin"
fi fi
if [ ! -f "$source" ]; then if [ ! -f "$source" ]; then
echo "Source \"$source\" does not exist." >&2 echo "Source '$source' does not exist." >&2
exit 1 exit 1
else else
if [ "$type" != "file" ]; then if [ "$type" != "file" ]; then
@ -96,7 +96,7 @@ DONE
fi fi
# move uploaded file into place # move uploaded file into place
cat << DONE cat << DONE
$__remote_exec $__target_host "rm -rf \"$destination\"; mv \"\$destination_upload\" \"$destination\"" $__remote_exec $__target_host "rm -rf '$destination'; mv \"\$destination_upload\" '$destination'"
DONE DONE
fi fi
fi fi

View file

@ -23,7 +23,7 @@ destination="/$__object_id"
state_should="$(cat "$__object/parameter/state")" state_should="$(cat "$__object/parameter/state")"
type="$(cat "$__object/explorer/type")" type="$(cat "$__object/explorer/type")"
stat_file="$__object/explorer/stat" stat_file="$__object/explorer/stat"
fire_onchange=''
get_current_value() { get_current_value() {
if [ -s "$stat_file" ]; then if [ -s "$stat_file" ]; then
@ -44,20 +44,17 @@ get_current_value() {
set_group() { set_group() {
echo "chgrp '$1' '$destination'" echo "chgrp '$1' '$destination'"
echo "chgrp '$1'" >> "$__messages_out" echo "chgrp $1" >> "$__messages_out"
fire_onchange=1
} }
set_owner() { set_owner() {
echo "chown '$1' '$destination'" echo "chown '$1' '$destination'"
echo "chown '$1'" >> "$__messages_out" echo "chown $1" >> "$__messages_out"
fire_onchange=1
} }
set_mode() { set_mode() {
echo "chmod '$1' '$destination'" echo "chmod '$1' '$destination'"
echo "chmod '$1'" >> "$__messages_out" echo "chmod $1" >> "$__messages_out"
fire_onchange=1
} }
case "$state_should" in case "$state_should" in
@ -79,10 +76,6 @@ case "$state_should" in
fi fi
fi fi
done done
if [ -f "$__object/files/set-attributes" ]; then
# set-attributes is created if file is created or uploaded in gencode-local
fire_onchange=1
fi
;; ;;
@ -90,7 +83,6 @@ case "$state_should" in
if [ "$type" = "file" ]; then if [ "$type" = "file" ]; then
echo "rm -f '$destination'" echo "rm -f '$destination'"
echo remove >> "$__messages_out" echo remove >> "$__messages_out"
fire_onchange=1
fi fi
;; ;;
@ -99,9 +91,3 @@ case "$state_should" in
exit 1 exit 1
;; ;;
esac esac
if [ -f "$__object/parameter/onchange" ]; then
if [ -n "$fire_onchange" ]; then
cat "$__object/parameter/onchange"
fi
fi

View file

@ -63,9 +63,6 @@ source
If not supplied, an empty file or directory will be created. If not supplied, an empty file or directory will be created.
If source is '-' (dash), take what was written to stdin as the file content. If source is '-' (dash), take what was written to stdin as the file content.
onchange
The code to run if file is modified.
MESSAGES MESSAGES
-------- --------
chgrp <group> chgrp <group>

View file

@ -3,4 +3,3 @@ group
mode mode
owner owner
source source
onchange

View file

@ -19,6 +19,7 @@
# #
# #
# name="$__object_id"
state_should="$(cat "$__object/parameter/state")" state_should="$(cat "$__object/parameter/state")"
state_is="$(cat "$__object/explorer/rule")" state_is="$(cat "$__object/explorer/rule")"

View file

@ -42,16 +42,16 @@ esac
if [ "$init" = 'systemd' ]; then if [ "$init" = 'systemd' ]; then
# this handles ALL linux distros with systemd # this handles ALL linux distros with systemd
# e.g. archlinux, gentoo in some cases, new RHEL and SLES versions # e.g. archlinux, gentoo in some cases, new RHEL and SLES versions
echo "systemctl \"$cmd\" \"$name\"" echo "systemctl '$cmd' '$name'"
else else
case "$os" in case "$os" in
debian) debian)
case "$os_version" in case "$os_version" in
[1-7]*) [1-7]*)
echo "service \"$name\" \"$cmd\"" echo "service '$name' '$cmd'"
;; ;;
8*) 8*)
echo "systemctl \"$cmd\" \"$name\"" echo "systemctl '$cmd' '$name'"
;; ;;
*) *)
echo "Unsupported version $os_version of $os" >&2 echo "Unsupported version $os_version of $os" >&2
@ -61,19 +61,19 @@ else
;; ;;
gentoo) gentoo)
echo service \"$name\" \"$cmd\" echo "service '$name' '$cmd'"
;; ;;
amazon|scientific|centos|fedora|owl|redhat|suse) amazon|scientific|centos|fedora|owl|redhat|suse)
echo service \"$name\" \"$cmd\" echo "service '$name' '$cmd'"
;; ;;
openwrt) openwrt)
echo "/etc/init.d/\"$name\" \"$cmd\"" echo "'/etc/init.d/$name' '$cmd'"
;; ;;
ubuntu) ubuntu)
echo "service \"$name\" \"$cmd\"" echo "service '$name' '$cmd'"
;; ;;
*) *)

Some files were not shown because too many files have changed in this diff Show more