From 87d6a9c33666d4c351230150c2be9b0efcda032c Mon Sep 17 00:00:00 2001
From: Darko Poljak <darko.poljak@gmail.com>
Date: Mon, 18 Jul 2016 19:43:05 +0200
Subject: [PATCH 1/6] Fix line begining with . is a macro for man page.
---
cdist/conf/type/__apt_key/man.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cdist/conf/type/__apt_key/man.rst b/cdist/conf/type/__apt_key/man.rst
index 488a1a06..7ee2a621 100644
--- a/cdist/conf/type/__apt_key/man.rst
+++ b/cdist/conf/type/__apt_key/man.rst
@@ -25,8 +25,8 @@ keyid
the id of the key to add. Defaults to __object_id
keyserver
- the keyserver from which to fetch the key. If omitted the default set in
- ./parameter/default/keyserver is used.
+ the keyserver from which to fetch the key. If omitted the default set
+ in ./parameter/default/keyserver is used.
EXAMPLES
From 0d82c379284b2515a3d72332fd4848fd615f680a Mon Sep 17 00:00:00 2001
From: Darko Poljak <darko.poljak@gmail.com>
Date: Mon, 18 Jul 2016 19:43:26 +0200
Subject: [PATCH 2/6] Fix spelling errors (Dmitry Bogatov).
---
cdist/conf/type/__consul_agent/man.rst | 2 +-
cdist/conf/type/__key_value/man.rst | 4 ++--
cdist/conf/type/__staged_file/man.rst | 2 +-
cdist/conf/type/__zypper_service/man.rst | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cdist/conf/type/__consul_agent/man.rst b/cdist/conf/type/__consul_agent/man.rst
index 5a35a2cc..fcbf112d 100644
--- a/cdist/conf/type/__consul_agent/man.rst
+++ b/cdist/conf/type/__consul_agent/man.rst
@@ -111,7 +111,7 @@ syslog
enables logging to syslog
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
enforce the use of TLS and verify the peers authenticity on outgoing connections
diff --git a/cdist/conf/type/__key_value/man.rst b/cdist/conf/type/__key_value/man.rst
index 80d6aa89..0d0ad3ae 100644
--- a/cdist/conf/type/__key_value/man.rst
+++ b/cdist/conf/type/__key_value/man.rst
@@ -72,13 +72,13 @@ EXAMPLES
--delimiter ' = ' --comment '# my linux kernel should act as a router'
# Remove existing key/value
- __key_value LEGACY_KEY --file /etc/somefile --state absent --delimiter '='
+ __key_value LEGACY_KEY --file /etc/somefile --state absent --delimiter '='
MORE INFORMATION
----------------
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
diff --git a/cdist/conf/type/__staged_file/man.rst b/cdist/conf/type/__staged_file/man.rst
index 3d8ee966..4c54e5f5 100644
--- a/cdist/conf/type/__staged_file/man.rst
+++ b/cdist/conf/type/__staged_file/man.rst
@@ -15,7 +15,7 @@ cdist) and then deployed to the target host using the __file type.
REQUIRED PARAMETERS
-------------------
source
- the URL from which to retreive the source file.
+ the URL from which to retrieve the source file.
e.g.
* https://dl.bintray.com/mitchellh/consul/0.4.1_linux_amd64.zip
diff --git a/cdist/conf/type/__zypper_service/man.rst b/cdist/conf/type/__zypper_service/man.rst
index c596dea0..c76a5ffc 100644
--- a/cdist/conf/type/__zypper_service/man.rst
+++ b/cdist/conf/type/__zypper_service/man.rst
@@ -20,10 +20,10 @@ uri
OPTIONAL PARAMETERS
-------------------
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
- Either "present" or "absent", defaults to "present"
+ Either "present" or "absent", defaults to "present"
type
Defaults to "ris", the standard type of services at SLES11. For other values, see manpage of zypper.
From 1815936b7d4473fca51abe967fb8de5a34495e90 Mon Sep 17 00:00:00 2001
From: Darko Poljak <darko.poljak@gmail.com>
Date: Mon, 18 Jul 2016 19:47:36 +0200
Subject: [PATCH 3/6] Fix import error when PYTHONPATH is not set.
---
docs/src/conf.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/docs/src/conf.py b/docs/src/conf.py
index dee11095..463bcedd 100644
--- a/docs/src/conf.py
+++ b/docs/src/conf.py
@@ -15,7 +15,6 @@
import sys
import os
-import cdist.version
import sphinx_rtd_theme
# 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.
# sys.path.insert(0, os.path.abspath('.'))
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 ------------------------------------------------
From 25bfad452c902f100282301b0f85e9a9edcc7ef1 Mon Sep 17 00:00:00 2001
From: Darko Poljak <darko.poljak@gmail.com>
Date: Mon, 18 Jul 2016 19:48:54 +0200
Subject: [PATCH 4/6] Fix missing trailing slash for archive prefix.
---
bin/build-helper | 2 +-
bin/build-helper.freebsd | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/build-helper b/bin/build-helper
index ff628847..5fd4941c 100755
--- a/bin/build-helper
+++ b/bin/build-helper
@@ -196,7 +196,7 @@ eof
archivename="$3"
else
archivename="cdist-${tag}.tar.gz"
- git archive --prefix="cdist-${tag}" -o "${archivename}" "${tag}" \
+ git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \
|| exit 1
fi
gpg --armor --detach-sign "${archivename}" || exit 1
diff --git a/bin/build-helper.freebsd b/bin/build-helper.freebsd
index e5b081ff..cea75afc 100755
--- a/bin/build-helper.freebsd
+++ b/bin/build-helper.freebsd
@@ -231,7 +231,7 @@ eof
archivename="$3"
else
archivename="cdist-${tag}.tar.gz"
- git archive --prefix="cdist-${tag}" -o "${archivename}" "${tag}" \
+ git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \
|| exit 1
fi
gpg --armor --detach-sign "${archivename}" || exit 1
From 25e69d130211b9262e4c5d0496f6304731d516e6 Mon Sep 17 00:00:00 2001
From: Darko Poljak <darko.poljak@gmail.com>
Date: Mon, 18 Jul 2016 19:58:21 +0200
Subject: [PATCH 5/6] Fix release signing: upload also archive that is signed.
---
bin/build-helper | 7 +++++++
bin/build-helper.freebsd | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/bin/build-helper b/bin/build-helper
index 5fd4941c..16ad67ee 100755
--- a/bin/build-helper
+++ b/bin/build-helper
@@ -217,6 +217,13 @@ eof
| 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" \
diff --git a/bin/build-helper.freebsd b/bin/build-helper.freebsd
index cea75afc..829fbf09 100755
--- a/bin/build-helper.freebsd
+++ b/bin/build-helper.freebsd
@@ -252,6 +252,13 @@ eof
| 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" \
From b7d2ec4b6e0aa75fcc1b4d0f33d55d191f440fdc Mon Sep 17 00:00:00 2001
From: Darko Poljak <darko.poljak@gmail.com>
Date: Mon, 18 Jul 2016 20:12:48 +0200
Subject: [PATCH 6/6] 4.2.1 changelog
---
docs/changelog | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/docs/changelog b/docs/changelog
index 7873fff0..d85af785 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -1,6 +1,12 @@
Changelog
---------
+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
* Build: Make github signed release (Darko Poljak)
* Core: Fix hostdir: use hash instead of target host (Steven Armstrong)