From 4ffde06fe88377e0aa36bacbcb40405f0f2081bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20H=C3=BCrlimann?= Date: Wed, 13 May 2015 13:44:55 +0200 Subject: [PATCH 1/6] Added centos to type __locale --- cdist/conf/type/__locale/manifest | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cdist/conf/type/__locale/manifest b/cdist/conf/type/__locale/manifest index e7230f9c..0e279630 100644 --- a/cdist/conf/type/__locale/manifest +++ b/cdist/conf/type/__locale/manifest @@ -1,6 +1,7 @@ #!/bin/sh # # 2013-2015 Nico Schottelius (nico-cdist at schottelius.org) +# 2015 David Hürlimann (david at ungleich.ch) # # This file is part of cdist. # @@ -29,7 +30,7 @@ case "$os" in # Debian needs a seperate package __package locales --state present ;; - archlinux|suse|ubuntu) + archlinux|suse|ubuntu|centos) : ;; *) From 45df8dca119e3004596f290ce423843163cb145b Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 16 May 2015 16:49:48 +0200 Subject: [PATCH 2/6] __consul type requires unzip to be installed Signed-off-by: Nico Schottelius --- cdist/conf/type/__consul/manifest | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cdist/conf/type/__consul/manifest b/cdist/conf/type/__consul/manifest index 1cbc5413..ea1a728f 100755 --- a/cdist/conf/type/__consul/manifest +++ b/cdist/conf/type/__consul/manifest @@ -43,7 +43,9 @@ if [ ! -d "$version_dir" ]; then exit 1 fi -__staged_file /usr/local/bin/consul \ +__package unzip + +require="__package/unzip" __staged_file /usr/local/bin/consul \ --source "$(cat "$version_dir/source")" \ --cksum "$(cat "$version_dir/cksum")" \ --fetch-command 'curl -s -L "%s"' \ From 8819f54116bfbd752fd8b0aebfc59110b669d5d7 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 16 May 2015 17:40:27 +0200 Subject: [PATCH 3/6] comparision in shell is =, not == Signed-off-by: Nico Schottelius --- cdist/conf/type/__staged_file/gencode-local | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cdist/conf/type/__staged_file/gencode-local b/cdist/conf/type/__staged_file/gencode-local index 87d79f4c..1a236789 100755 --- a/cdist/conf/type/__staged_file/gencode-local +++ b/cdist/conf/type/__staged_file/gencode-local @@ -1,6 +1,7 @@ #!/bin/sh # # 2015 Steven Armstrong (steven-cdist at armstrong.cc) +# 2015 Nico Schottelius (nico-cdist at schottelius.org) # # This file is part of cdist. # @@ -74,7 +75,7 @@ cat << DONE verify_cksum() { cksum_is="\$(cksum "$stage_file" | 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 else return 1 From 10662c48df86b60355592447c3da17faf059eadb Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 16 May 2015 17:43:46 +0200 Subject: [PATCH 4/6] +consul 0.5.1 Signed-off-by: Nico Schottelius --- cdist/conf/type/__consul/files/versions/0.5.1/cksum | 1 + cdist/conf/type/__consul/files/versions/0.5.1/source | 1 + docs/changelog | 7 +++++-- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 cdist/conf/type/__consul/files/versions/0.5.1/cksum create mode 100644 cdist/conf/type/__consul/files/versions/0.5.1/source diff --git a/cdist/conf/type/__consul/files/versions/0.5.1/cksum b/cdist/conf/type/__consul/files/versions/0.5.1/cksum new file mode 100644 index 00000000..a176ed43 --- /dev/null +++ b/cdist/conf/type/__consul/files/versions/0.5.1/cksum @@ -0,0 +1 @@ +2564582176 18232733 consul diff --git a/cdist/conf/type/__consul/files/versions/0.5.1/source b/cdist/conf/type/__consul/files/versions/0.5.1/source new file mode 100644 index 00000000..f02a1103 --- /dev/null +++ b/cdist/conf/type/__consul/files/versions/0.5.1/source @@ -0,0 +1 @@ +https://dl.bintray.com/mitchellh/consul/0.5.1_linux_amd64.zip diff --git a/docs/changelog b/docs/changelog index 7f3d8a9e..a11ac9be 100644 --- a/docs/changelog +++ b/docs/changelog @@ -1,10 +1,13 @@ Changelog --------- -next: +3.1.13: 2015-05-16 * 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 __firewalld_rule: Ensure firewalld is present (David Hürlimann) + * Type __firewalld_rule: Ensure firewalld package is present (David Hürlimann) + * Type __staged_file: Fix comparision operator (Nico Schottelius) 3.1.12: 2015-03-19 * Core: Support object ids '.cdist' (Nico Schottelius) From fc09cdb720934b13e99ddf05926107b02ea8a78b Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 16 May 2015 17:47:42 +0200 Subject: [PATCH 5/6] ++changes Signed-off-by: Nico Schottelius --- docs/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/changelog b/docs/changelog index a11ac9be..428bf457 100644 --- a/docs/changelog +++ b/docs/changelog @@ -7,7 +7,9 @@ Changelog * Type __consul: Add source & cksum for 0.5.1 (Nico Schottelius) * Type __consul_agent: Use systemd for Debian 8 (Nico Schottelius) * 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 * Core: Support object ids '.cdist' (Nico Schottelius) From 416eb300c0a767ae327970e042bba149d62d4365 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 18 May 2015 14:41:34 +0200 Subject: [PATCH 6/6] update path to website Signed-off-by: Nico Schottelius --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a2003dcc..fb5fc09f 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ TYPEDIR=cdist/conf/type WEBSRCDIR=docs/web -WEBDIR=$$HOME/www.nico.schottelius.org +WEBDIR=$$HOME/vcs/www.nico.schottelius.org WEBBLOG=$(WEBDIR)/blog WEBBASE=$(WEBDIR)/software/cdist WEBPAGE=$(WEBBASE).mdwn