[Pkg-freeipa-devel] dogtag-pki: Changes to 'master'

[Timo Aaltonen]

 debian/changelog                        |    8 ++++++++
 debian/patches/create-target-wants.diff |   13 +++++++++++++
 debian/pki-server.postrm                |    1 +
 3 files changed, 22 insertions(+)

New commits:
commit 114e7d84f847fa9cca6cc490efd58a9f41869469
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Feb 16 11:09:44 2017 +0200

    releasing package dogtag-pki version 10.3.5+12-3

diff --git a/debian/changelog b/debian/changelog
index a031770..5238564 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-dogtag-pki (10.3.5+12-3) UNRELEASED; urgency=medium
+dogtag-pki (10.3.5+12-3) unstable; urgency=medium
 
   * server.postrm: Remove /etc/default/pki-tomcat on purge.
   * create-target-wants.diff: Create target.wants-directories in the
     python deployment scriptlet too.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Thu, 16 Feb 2017 10:48:25 +0200
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 16 Feb 2017 11:09:38 +0200
 
 dogtag-pki (10.3.5+12-2) unstable; urgency=medium
 

commit bab045e306423d1731b98188683a4b5f069347bf
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Feb 16 11:09:21 2017 +0200

    create-target-wants.diff: Create target.wants-directories in the python deployment scriptlet too.

diff --git a/debian/changelog b/debian/changelog
index 2a51530..a031770 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 dogtag-pki (10.3.5+12-3) UNRELEASED; urgency=medium
 
   * server.postrm: Remove /etc/default/pki-tomcat on purge.
+  * create-target-wants.diff: Create target.wants-directories in the
+    python deployment scriptlet too.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 16 Feb 2017 10:48:25 +0200
 
diff --git a/debian/patches/create-target-wants.diff b/debian/patches/create-target-wants.diff
index 4a2a95d..cc8d29f 100644
--- a/debian/patches/create-target-wants.diff
+++ b/debian/patches/create-target-wants.diff
@@ -11,3 +11,16 @@
      # '${PKI_INSTANCE_PATH}' symlinks
      base_symlinks=(
          [alias]=/etc/pki/${PKI_INSTANCE_NAME}/alias
+--- a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
++++ b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
+@@ -187,6 +187,10 @@ class PkiScriptlet(pkiscriptlet.Abstract
+                 deployer.mdict['pki_instance_log_path'],
+                 deployer.mdict['pki_instance_logs_link'])
+ 
++            # create instance target.wants directory if necessary
++            if not os.path.exists(deployer.mdict['pki_systemd_target_wants']):
++                os.mkdir(deployer.mdict['pki_systemd_target_wants'])
++
+             # create Tomcat instance systemd service link
+             deployer.symlink.create(deployer.mdict['pki_systemd_service'],
+                                     deployer.mdict['pki_systemd_service_link'])

commit a2020c78b630aed4b421f2bdaf2ea6a7b1d62206
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Feb 16 10:48:27 2017 +0200

    server.postrm: Remove /etc/default/pki-tomcat on purge.

diff --git a/debian/changelog b/debian/changelog
index a8c93c9..2a51530 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dogtag-pki (10.3.5+12-3) UNRELEASED; urgency=medium
+
+  * server.postrm: Remove /etc/default/pki-tomcat on purge.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 16 Feb 2017 10:48:25 +0200
+
 dogtag-pki (10.3.5+12-2) unstable; urgency=medium
 
   * base, server, tools: Add new manpages.
diff --git a/debian/pki-server.postrm b/debian/pki-server.postrm
index a1910f1..2c1fb01 100644
--- a/debian/pki-server.postrm
+++ b/debian/pki-server.postrm
@@ -8,6 +8,7 @@ if [ "$1" = purge ]; then
     rm -rf /var/log/pki/server
 
     # these are created by pkispawn
+    rm -f /etc/default/pki-tomcat
     rm -rf /etc/dogtag/tomcat/pki-tomcat
     rm -rf /etc/pki/pki-tomcat
     rm -f /etc/systemd/system/pki-tomcatd.target.wants/*