Merge branch '4.2'

This commit is contained in:
Darko Poljak 2016-07-18 20:33:23 +02:00
commit a434ec8dde
9 changed files with 34 additions and 13 deletions

View file

@ -196,7 +196,7 @@ eof
archivename="$3" archivename="$3"
else else
archivename="cdist-${tag}.tar.gz" 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
fi fi
gpg --armor --detach-sign "${archivename}" || exit 1 gpg --armor --detach-sign "${archivename}" || exit 1
@ -217,6 +217,13 @@ eof
| python3 -c 'import json; import sys; print(json.loads(sys.stdin.read())["id"])') \ | python3 -c 'import json; import sys; print(json.loads(sys.stdin.read())["id"])') \
|| exit 1 || 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}" \ curl -H "Authorization: token ${token}" \
-H "Accept: application/vnd.github.manifold-preview" \ -H "Accept: application/vnd.github.manifold-preview" \
-H "Content-Type: application/pgp-signature" \ -H "Content-Type: application/pgp-signature" \

View file

@ -231,7 +231,7 @@ eof
archivename="$3" archivename="$3"
else else
archivename="cdist-${tag}.tar.gz" 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
fi fi
gpg --armor --detach-sign "${archivename}" || exit 1 gpg --armor --detach-sign "${archivename}" || exit 1
@ -252,6 +252,13 @@ eof
| python3 -c 'import json; import sys; print(json.loads(sys.stdin.read())["id"])') \ | python3 -c 'import json; import sys; print(json.loads(sys.stdin.read())["id"])') \
|| exit 1 || 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}" \ curl -H "Authorization: token ${token}" \
-H "Accept: application/vnd.github.manifold-preview" \ -H "Accept: application/vnd.github.manifold-preview" \
-H "Content-Type: application/pgp-signature" \ -H "Content-Type: application/pgp-signature" \

View file

@ -25,8 +25,8 @@ keyid
the id of the key to add. Defaults to __object_id the id of the key to add. Defaults to __object_id
keyserver keyserver
the keyserver from which to fetch the key. If omitted the default set in the keyserver from which to fetch the key. If omitted the default set
./parameter/default/keyserver is used. in ./parameter/default/keyserver is used.
EXAMPLES EXAMPLES

View file

@ -111,7 +111,7 @@ syslog
enables logging to syslog enables logging to syslog
verify-incoming verify-incoming
enforce the use of TLS and verify a client's authenticity on incomming connections enforce the use of TLS and verify a client's authenticity on incoming connections
verify-outgoing verify-outgoing
enforce the use of TLS and verify the peers authenticity on outgoing connections enforce the use of TLS and verify the peers authenticity on outgoing connections

View file

@ -78,7 +78,7 @@ EXAMPLES
MORE INFORMATION MORE INFORMATION
---------------- ----------------
This type try to handle as many values as possible, so it doesn't use regexes. This type try to handle as many values as possible, so it doesn't use regexes.
So you need to exactly specify the key and delimiter. Delimiter can be of any lenght. So you need to exactly specify the key and delimiter. Delimiter can be of any length.
AUTHORS AUTHORS

View file

@ -15,7 +15,7 @@ cdist) and then deployed to the target host using the __file type.
REQUIRED PARAMETERS REQUIRED PARAMETERS
------------------- -------------------
source source
the URL from which to retreive the source file. the URL from which to retrieve the source file.
e.g. e.g.
* https://dl.bintray.com/mitchellh/consul/0.4.1_linux_amd64.zip * https://dl.bintray.com/mitchellh/consul/0.4.1_linux_amd64.zip

View file

@ -20,7 +20,7 @@ uri
OPTIONAL PARAMETERS OPTIONAL PARAMETERS
------------------- -------------------
service_desc service_desc
If supplied, use the service_desc and not the object id as descritpion for the service. If supplied, use the service_desc and not the object id as description for the service.
state state
Either "present" or "absent", defaults to "present" Either "present" or "absent", defaults to "present"

View file

@ -1,7 +1,11 @@
Changelog Changelog
--------- ---------
next: 4.2.1: 2016-07-18
* Build: Fix signed release (Darko Poljak)
* Build: Fix building docs (Darko Poljak)
* Documentation: Fix man pages (Dmitry Bogatov)
* Documentation: Fix spellings (Dmitry Bogatov)
4.2.0: 2016-07-16 4.2.0: 2016-07-16
* Build: Make github signed release (Darko Poljak) * Build: Make github signed release (Darko Poljak)

View file

@ -15,7 +15,6 @@
import sys import sys
import os import os
import cdist.version
import sphinx_rtd_theme import sphinx_rtd_theme
# If extensions (or modules to document with autodoc) are in another directory, # If extensions (or modules to document with autodoc) are in another directory,
@ -23,7 +22,11 @@ import sphinx_rtd_theme
# documentation root, use os.path.abspath to make it absolute, like shown here. # documentation root, use os.path.abspath to make it absolute, like shown here.
# sys.path.insert(0, os.path.abspath('.')) # sys.path.insert(0, os.path.abspath('.'))
sys.path.insert(0, os.path.abspath(os.path.join( sys.path.insert(0, os.path.abspath(os.path.join(
os.path.dirname(os.path.realpath(__file__)), "../../"))) os.path.dirname(os.path.realpath(__file__)), "..", "..")))
# Import cdist after sys.path fixup above.
import cdist.version # nopep8 - ignore error that import is not at top
# -- General configuration ------------------------------------------------ # -- General configuration ------------------------------------------------