kjg/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into feature_install_and_preos

Browse source 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
This commit is contained in:
Nico Schottelius 2015-05-18 14:42:07 +02:00
commit 72bf86646d
7 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -35,7 +35,7 @@ TYPEDIR=cdist/conf/type
WEBSRCDIR=docs/web WEBSRCDIR=docs/web
WEBDIR=$$HOME/www.nico.schottelius.org WEBDIR=$$HOME/vcs/www.nico.schottelius.org
WEBBLOG=$(WEBDIR)/blog WEBBLOG=$(WEBDIR)/blog
WEBBASE=$(WEBDIR)/software/cdist WEBBASE=$(WEBDIR)/software/cdist
WEBPAGE=$(WEBBASE).mdwn WEBPAGE=$(WEBBASE).mdwn

1
cdist/conf/type/__consul/files/versions/0.5.1/cksum Normal file
View file

@ -0,0 +1 @@
2564582176 18232733 consul

1
cdist/conf/type/__consul/files/versions/0.5.1/source Normal file
View file

@ -0,0 +1 @@
https://dl.bintray.com/mitchellh/consul/0.5.1_linux_amd64.zip

4
cdist/conf/type/__consul/manifest
View file

@ -43,7 +43,9 @@ if [ ! -d "$version_dir" ]; then
exit 1 exit 1
fi fi
__staged_file /usr/local/bin/consul \ __package unzip
require="__package/unzip" __staged_file /usr/local/bin/consul \
--source "$(cat "$version_dir/source")" \ --source "$(cat "$version_dir/source")" \
--cksum "$(cat "$version_dir/cksum")" \ --cksum "$(cat "$version_dir/cksum")" \
--fetch-command 'curl -s -L "%s"' \ --fetch-command 'curl -s -L "%s"' \

3
cdist/conf/type/__locale/manifest
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# 2013-2015 Nico Schottelius (nico-cdist at schottelius.org) # 2013-2015 Nico Schottelius (nico-cdist at schottelius.org)
# 2015 David Hürlimann (david at ungleich.ch)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -29,7 +30,7 @@ case "$os" in
# Debian needs a seperate package # Debian needs a seperate package
__package locales --state present __package locales --state present
;; ;;
archlinux|suse|ubuntu) archlinux|suse|ubuntu|centos)
: :
;; ;;
*) *)

3
cdist/conf/type/__staged_file/gencode-local
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# 2015 Steven Armstrong (steven-cdist at armstrong.cc) # 2015 Steven Armstrong (steven-cdist at armstrong.cc)
# 2015 Nico Schottelius (nico-cdist at schottelius.org)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -74,7 +75,7 @@ cat << DONE
verify_cksum() { verify_cksum() {
cksum_is="\$(cksum "$stage_file" | cut -d' ' -f1,2)" cksum_is="\$(cksum "$stage_file" | cut -d' ' -f1,2)"
cksum_should="$(cat "$__object/parameter/cksum" | cut -d' ' -f1,2)" cksum_should="$(cat "$__object/parameter/cksum" | cut -d' ' -f1,2)"
if [ "\$cksum_is" == "\$cksum_should" ]; then if [ "\$cksum_is" = "\$cksum_should" ]; then
return 0 return 0
else else
return 1 return 1

9
docs/changelog
View file

@ -13,10 +13,15 @@ Changelog
* Core: Integrate initial install support (Nico Schottelius) * Core: Integrate initial install support (Nico Schottelius)
* Core: Integrate initial preos support (Nico Schottelius) * Core: Integrate initial preos support (Nico Schottelius)
next: 3.1.13: 2015-05-16
* Type __block: Fix support for non stdin blocks (Dominique Roux) * Type __block: Fix support for non stdin blocks (Dominique Roux)
* Type __consul: Install package unzip (Nico Schottelius)
* Type __consul: Add source & cksum for 0.5.1 (Nico Schottelius)
* Type __consul_agent: Use systemd for Debian 8 (Nico Schottelius) * Type __consul_agent: Use systemd for Debian 8 (Nico Schottelius)
* Type __firewalld_rule: Ensure firewalld is present (David Hürlimann) * Type __firewalld_rule: Ensure firewalld package is present (David Hürlimann)
* Type __locale: Support CentOS (David Hürlimann)
* Type __staged_file: Fix comparision operator (Nico Schottelius)
* Type __user_groups: Support old Linux versions (Daniel Heule)
3.1.12: 2015-03-19 3.1.12: 2015-03-19
* Core: Support object ids '.cdist' (Nico Schottelius) * Core: Support object ids '.cdist' (Nico Schottelius)