From 82bcc83d4164c5e83b5ccde75d74637bceca0887 Mon Sep 17 00:00:00 2001
From: Tomas Pospisek <tpo_hp@sourcepole.ch>
Date: Mon, 18 Aug 2014 19:09:19 +0200
Subject: [PATCH 1/6] add new __package_dpkg type
---
cdist/conf/type/__package_dpkg/gencode-local | 57 +++++++++++++++++++
cdist/conf/type/__package_dpkg/man.text | 47 +++++++++++++++
.../type/__package_dpkg/parameter/required | 1 +
cdist/conf/type/__package_dpkg/singleton | 0
4 files changed, 105 insertions(+)
create mode 100755 cdist/conf/type/__package_dpkg/gencode-local
create mode 100644 cdist/conf/type/__package_dpkg/man.text
create mode 100644 cdist/conf/type/__package_dpkg/parameter/required
create mode 100644 cdist/conf/type/__package_dpkg/singleton
diff --git a/cdist/conf/type/__package_dpkg/gencode-local b/cdist/conf/type/__package_dpkg/gencode-local
new file mode 100755
index 00000000..9704c46c
--- /dev/null
+++ b/cdist/conf/type/__package_dpkg/gencode-local
@@ -0,0 +1,57 @@
+#!/bin/sh
+#
+# 2013 Tomas Pospisek (tpo_deb sourcepole.ch)
+#
+# This file is based on cdist's __file/gencode-local and 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 __package_dpkg type does not check whether a *.deb package is
+# allready installed. It just copies the *.deb package over to the
+# destination and installs it. We could use __package_apt to check
+# whether a *.deb package is allready installed and only install it
+# if we're given a --force argument or similar (would be clever not
+# to conflict with dpkg's --force options). But currently we don't
+# do any checks or --force'ing.
+#
+
+local_package_path=$( cat "$__object/parameter/install" )
+package=$( basename "$local_package_path" )
+
+if [ ! -f "$local_package_path" ]; then
+ echo "Package \"$local_package_path\" does not exist." >&2
+ exit 1
+fi
+
+# upload package to temp directory
+temp_dir="cdist.XXXXXXXXXX"
+cat << DONE
+destination_dir="\$($__remote_exec $__target_host "mktemp -d $temp_dir")"
+DONE
+
+cat << DONE
+$__remote_copy $local_package_path ${__target_host}:\$destination_dir
+DONE
+
+# install package
+echo "3" >&2
+cat << DONE
+$__remote_exec $__target_host "dpkg -i \"\$destination_dir/$package\""
+DONE
+
+# clean up: remove tmp_dir and contents on remote host
+cat << DONE
+$__remote_exec $__target_host "rm -rf \"\$destination_dir\""
+DONE
diff --git a/cdist/conf/type/__package_dpkg/man.text b/cdist/conf/type/__package_dpkg/man.text
new file mode 100644
index 00000000..e6a67e79
--- /dev/null
+++ b/cdist/conf/type/__package_dpkg/man.text
@@ -0,0 +1,47 @@
+cdist-type__package_dpkg(7)
+==========================
+Tomas Pospisek <tpo_hp--@--sourcepole.ch>
+
+
+NAME
+----
+cdist-type__package_dpkg - Manage packages with dpkg
+
+
+DESCRIPTION
+-----------
+dpkg is usually used on Debian and variants (like Ubuntu) to
+install packages.
+
+
+REQUIRED PARAMETERS
+-------------------
+install::
+ Specifies the local path to the *.deb package to be installed
+
+
+OPTIONAL PARAMETERS
+-------------------
+None
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# Install foo package
+__package_dpkg --install /tmp/foo_0.1_all.deb
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- cdist-type__package(7)
+
+
+COPYING
+-------
+Copyright \(C) 2013 Tomas Pospisek. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
+This type is based on __package_apt
diff --git a/cdist/conf/type/__package_dpkg/parameter/required b/cdist/conf/type/__package_dpkg/parameter/required
new file mode 100644
index 00000000..7c32f559
--- /dev/null
+++ b/cdist/conf/type/__package_dpkg/parameter/required
@@ -0,0 +1 @@
+install
diff --git a/cdist/conf/type/__package_dpkg/singleton b/cdist/conf/type/__package_dpkg/singleton
new file mode 100644
index 00000000..e69de29b
From d8af4d3ad5e53b8aac3b571aac969f36a63d2d6b Mon Sep 17 00:00:00 2001
From: Tomas Pospisek <tpo_hp@sourcepole.ch>
Date: Mon, 18 Aug 2014 19:11:28 +0200
Subject: [PATCH 2/6] fix email address
---
cdist/conf/type/__package_dpkg/man.text | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cdist/conf/type/__package_dpkg/man.text b/cdist/conf/type/__package_dpkg/man.text
index e6a67e79..6dc07c41 100644
--- a/cdist/conf/type/__package_dpkg/man.text
+++ b/cdist/conf/type/__package_dpkg/man.text
@@ -1,6 +1,6 @@
cdist-type__package_dpkg(7)
==========================
-Tomas Pospisek <tpo_hp--@--sourcepole.ch>
+Tomas Pospisek <tpo_deb--@--sourcepole.ch>
NAME
From 44941137d67d3a534b066bc4ddc93a466ca4e180 Mon Sep 17 00:00:00 2001
From: Tomas Pospisek <tpo_hp@sourcepole.ch>
Date: Wed, 10 Sep 2014 11:21:09 +0200
Subject: [PATCH 3/6] change implementation and API of __package_dpkg
__package_dpkg wasn't working as intended - being a singleton meant
that it could only install one package. Now we missuse
/var/cache/apt/archives to copy our package into and `dpkg -i` from
there
---
.../{gencode-local => gencode-remote} | 29 +---------------
cdist/conf/type/__package_dpkg/man.text | 21 +++++-------
cdist/conf/type/__package_dpkg/manifest | 34 +++++++++++++++++++
.../type/__package_dpkg/parameter/required | 2 +-
cdist/conf/type/__package_dpkg/singleton | 0
5 files changed, 45 insertions(+), 41 deletions(-)
rename cdist/conf/type/__package_dpkg/{gencode-local => gencode-remote} (62%)
create mode 100644 cdist/conf/type/__package_dpkg/manifest
delete mode 100644 cdist/conf/type/__package_dpkg/singleton
diff --git a/cdist/conf/type/__package_dpkg/gencode-local b/cdist/conf/type/__package_dpkg/gencode-remote
similarity index 62%
rename from cdist/conf/type/__package_dpkg/gencode-local
rename to cdist/conf/type/__package_dpkg/gencode-remote
index 9704c46c..d4186e66 100755
--- a/cdist/conf/type/__package_dpkg/gencode-local
+++ b/cdist/conf/type/__package_dpkg/gencode-remote
@@ -27,31 +27,4 @@
# do any checks or --force'ing.
#
-local_package_path=$( cat "$__object/parameter/install" )
-package=$( basename "$local_package_path" )
-
-if [ ! -f "$local_package_path" ]; then
- echo "Package \"$local_package_path\" does not exist." >&2
- exit 1
-fi
-
-# upload package to temp directory
-temp_dir="cdist.XXXXXXXXXX"
-cat << DONE
-destination_dir="\$($__remote_exec $__target_host "mktemp -d $temp_dir")"
-DONE
-
-cat << DONE
-$__remote_copy $local_package_path ${__target_host}:\$destination_dir
-DONE
-
-# install package
-echo "3" >&2
-cat << DONE
-$__remote_exec $__target_host "dpkg -i \"\$destination_dir/$package\""
-DONE
-
-# clean up: remove tmp_dir and contents on remote host
-cat << DONE
-$__remote_exec $__target_host "rm -rf \"\$destination_dir\""
-DONE
+echo "dpkg -i /var/cache/apt/archives/$__object_id"
diff --git a/cdist/conf/type/__package_dpkg/man.text b/cdist/conf/type/__package_dpkg/man.text
index 6dc07c41..ae98be99 100644
--- a/cdist/conf/type/__package_dpkg/man.text
+++ b/cdist/conf/type/__package_dpkg/man.text
@@ -10,27 +10,24 @@ cdist-type__package_dpkg - Manage packages with dpkg
DESCRIPTION
-----------
-dpkg is usually used on Debian and variants (like Ubuntu) to
-install packages.
+__package_dpkg is used on Debian and variants (like Ubuntu) to
+install packages that are provided locally as *.deb files.
+
+The object given to __package_dpkg must be the name of the deb package.
REQUIRED PARAMETERS
-------------------
-install::
- Specifies the local path to the *.deb package to be installed
-
-
-OPTIONAL PARAMETERS
--------------------
-None
-
+source::
+ path to the *.deb package
EXAMPLES
--------
--------------------------------------------------------------------------------
-# Install foo package
-__package_dpkg --install /tmp/foo_0.1_all.deb
+# Install foo and bar packages
+__package_dpkg --source /tmp/foo_0.1_all.deb foo_0.1_all.deb
+__package_dpkg --source $__type/files/bar_1.4.deb bar_1.4.deb
--------------------------------------------------------------------------------
diff --git a/cdist/conf/type/__package_dpkg/manifest b/cdist/conf/type/__package_dpkg/manifest
new file mode 100644
index 00000000..ff477c2d
--- /dev/null
+++ b/cdist/conf/type/__package_dpkg/manifest
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# 2013 Tomas Pospisek (tpo_deb sourcepole.ch)
+#
+# 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 __package_dpkg type does not check whether a *.deb package is
+# allready installed. It just copies the *.deb package over to the
+# destination and installs it. We could use __package_apt to check
+# whether a *.deb package is allready installed and only install it
+# if we're given a --force argument or similar (would be clever not
+# to conflict with dpkg's --force options). But currently we don't
+# do any checks or --force'ing.
+
+
+package_path=$( cat "$__object/parameter/source" )
+package=$( basename "$__object_id" )
+
+__file "/var/cache/apt/archives/$package" \
+ --source "$package_path" \
+ --state present
+
diff --git a/cdist/conf/type/__package_dpkg/parameter/required b/cdist/conf/type/__package_dpkg/parameter/required
index 7c32f559..5a18cd2f 100644
--- a/cdist/conf/type/__package_dpkg/parameter/required
+++ b/cdist/conf/type/__package_dpkg/parameter/required
@@ -1 +1 @@
-install
+source
diff --git a/cdist/conf/type/__package_dpkg/singleton b/cdist/conf/type/__package_dpkg/singleton
deleted file mode 100644
index e69de29b..00000000
From 8e3281aa7c5cf83c1180f139dbcbcc59e8878268 Mon Sep 17 00:00:00 2001
From: Tomas Pospisek <tpo_hp@sourcepole.ch>
Date: Thu, 1 Dec 2016 09:09:57 +0100
Subject: [PATCH 4/6] rewrite man page in rst
Only minimal changes needed.
This was done to satisfy darko-poljak's request here:
https://github.com/ungleich/cdist/pull/354#issuecomment-263492801
---
.../type/__package_dpkg/{man.text => man.rst} | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
rename cdist/conf/type/__package_dpkg/{man.text => man.rst} (62%)
diff --git a/cdist/conf/type/__package_dpkg/man.text b/cdist/conf/type/__package_dpkg/man.rst
similarity index 62%
rename from cdist/conf/type/__package_dpkg/man.text
rename to cdist/conf/type/__package_dpkg/man.rst
index ae98be99..2af69341 100644
--- a/cdist/conf/type/__package_dpkg/man.text
+++ b/cdist/conf/type/__package_dpkg/man.rst
@@ -1,7 +1,5 @@
cdist-type__package_dpkg(7)
==========================
-Tomas Pospisek <tpo_deb--@--sourcepole.ch>
-
NAME
----
@@ -18,27 +16,29 @@ The object given to __package_dpkg must be the name of the deb package.
REQUIRED PARAMETERS
-------------------
-source::
+source
path to the *.deb package
EXAMPLES
--------
---------------------------------------------------------------------------------
-# Install foo and bar packages
-__package_dpkg --source /tmp/foo_0.1_all.deb foo_0.1_all.deb
-__package_dpkg --source $__type/files/bar_1.4.deb bar_1.4.deb
---------------------------------------------------------------------------------
+.. code-block:: sh
+
+ # Install foo and bar packages
+ __package_dpkg --source /tmp/foo_0.1_all.deb foo_0.1_all.deb
+ __package_dpkg --source $__type/files/bar_1.4.deb bar_1.4.deb
SEE ALSO
--------
-- cdist-type(7)
-- cdist-type__package(7)
+:strong:`cdist-type`\ (7), :strong:`cdist-type__package`\ (7)
+AUTHORS
+-------
+Tomas Pospisek <tpo_deb--@--sourcepole.ch>
COPYING
-------
Copyright \(C) 2013 Tomas Pospisek. Free use of this software is
granted under the terms of the GNU General Public License version 3 (GPLv3).
-This type is based on __package_apt
+This type is based on __package_apt.
From 6bcfdec1545e862339ae0457e6ecd77593e8ca44 Mon Sep 17 00:00:00 2001
From: Tomas Pospisek <tpo_hp@sourcepole.ch>
Date: Thu, 1 Dec 2016 09:54:27 +0100
Subject: [PATCH 5/6] remove reference to cdist_type, use GPL3+
as requested by darko-poljak here:
https://github.com/ungleich/cdist/pull/360#issuecomment-264110087
---
cdist/conf/type/__package_dpkg/man.rst | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/cdist/conf/type/__package_dpkg/man.rst b/cdist/conf/type/__package_dpkg/man.rst
index 2af69341..fbd5b4b1 100644
--- a/cdist/conf/type/__package_dpkg/man.rst
+++ b/cdist/conf/type/__package_dpkg/man.rst
@@ -31,7 +31,7 @@ EXAMPLES
SEE ALSO
--------
-:strong:`cdist-type`\ (7), :strong:`cdist-type__package`\ (7)
+:strong:`cdist-type__package`\ (7)
AUTHORS
-------
@@ -39,6 +39,8 @@ Tomas Pospisek <tpo_deb--@--sourcepole.ch>
COPYING
-------
-Copyright \(C) 2013 Tomas Pospisek. Free use of this software is
-granted under the terms of the GNU General Public License version 3 (GPLv3).
+Copyright \(C) 2013 Tomas Pospisek. 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.
This type is based on __package_apt.
From 4370efdbb86910bb060cb003550347252904ba67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Posp=C3=AD=C5=A1ek?=
<tpo_deb@sourcepole.ch>
Date: Fri, 2 Dec 2016 09:39:53 +0100
Subject: [PATCH 6/6] Update man.rst
fix title as requested here https://github.com/ungleich/cdist/pull/354#issuecomment-264117501
---
cdist/conf/type/__package_dpkg/man.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cdist/conf/type/__package_dpkg/man.rst b/cdist/conf/type/__package_dpkg/man.rst
index fbd5b4b1..65a695b5 100644
--- a/cdist/conf/type/__package_dpkg/man.rst
+++ b/cdist/conf/type/__package_dpkg/man.rst
@@ -1,5 +1,5 @@
cdist-type__package_dpkg(7)
-==========================
+===========================
NAME
----