From 09409db18b7bb8928455ba658a979d9d2454f4ec Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Fri, 26 Jun 2015 16:19:48 +0300
Subject: [PATCH 01/42] first build using wheels

Cherry-picked from StackStorm/st2-packages@1552f462ca24080e60d264a31ae191a2fbf416fe
---
 sources/st2api/debian/postinst.ex | 39 +++++++++++++++++++++++++++++++
 sources/st2api/debian/postrm.ex   | 37 +++++++++++++++++++++++++++++
 sources/st2api/debian/preinst.ex  | 35 +++++++++++++++++++++++++++
 sources/st2api/debian/prerm.ex    | 38 ++++++++++++++++++++++++++++++
 4 files changed, 149 insertions(+)
 create mode 100644 sources/st2api/debian/postinst.ex
 create mode 100644 sources/st2api/debian/postrm.ex
 create mode 100644 sources/st2api/debian/preinst.ex
 create mode 100644 sources/st2api/debian/prerm.ex

diff --git a/sources/st2api/debian/postinst.ex b/sources/st2api/debian/postinst.ex
new file mode 100644
index 0000000000..b13772ed72
--- /dev/null
+++ b/sources/st2api/debian/postinst.ex
@@ -0,0 +1,39 @@
+#!/bin/sh
+# postinst script for st2api
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/sources/st2api/debian/postrm.ex b/sources/st2api/debian/postrm.ex
new file mode 100644
index 0000000000..6605c16d0c
--- /dev/null
+++ b/sources/st2api/debian/postrm.ex
@@ -0,0 +1,37 @@
+#!/bin/sh
+# postrm script for st2api
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/sources/st2api/debian/preinst.ex b/sources/st2api/debian/preinst.ex
new file mode 100644
index 0000000000..2b4b872c5a
--- /dev/null
+++ b/sources/st2api/debian/preinst.ex
@@ -0,0 +1,35 @@
+#!/bin/sh
+# preinst script for st2api
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/sources/st2api/debian/prerm.ex b/sources/st2api/debian/prerm.ex
new file mode 100644
index 0000000000..995c1eb923
--- /dev/null
+++ b/sources/st2api/debian/prerm.ex
@@ -0,0 +1,38 @@
+#!/bin/sh
+# prerm script for st2api
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

From 16cb769a44ab76c89e302959cf424804b3e477bc Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Fri, 26 Jun 2015 21:53:28 +0300
Subject: [PATCH 02/42] updates

Cherry-picked from StackStorm/st2-packages@6aa56d250941fbf6180351dab8e5da72f2e37d34
---
 sources/st2actions/debian/postinst.ex | 39 +++++++++++++++++++++++++++
 sources/st2actions/debian/postrm.ex   | 37 +++++++++++++++++++++++++
 sources/st2actions/debian/preinst.ex  | 35 ++++++++++++++++++++++++
 sources/st2actions/debian/prerm.ex    | 38 ++++++++++++++++++++++++++
 4 files changed, 149 insertions(+)
 create mode 100644 sources/st2actions/debian/postinst.ex
 create mode 100644 sources/st2actions/debian/postrm.ex
 create mode 100644 sources/st2actions/debian/preinst.ex
 create mode 100644 sources/st2actions/debian/prerm.ex

diff --git a/sources/st2actions/debian/postinst.ex b/sources/st2actions/debian/postinst.ex
new file mode 100644
index 0000000000..2a767e9c01
--- /dev/null
+++ b/sources/st2actions/debian/postinst.ex
@@ -0,0 +1,39 @@
+#!/bin/sh
+# postinst script for st2actions
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/sources/st2actions/debian/postrm.ex b/sources/st2actions/debian/postrm.ex
new file mode 100644
index 0000000000..ed8bffa37f
--- /dev/null
+++ b/sources/st2actions/debian/postrm.ex
@@ -0,0 +1,37 @@
+#!/bin/sh
+# postrm script for st2actions
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/sources/st2actions/debian/preinst.ex b/sources/st2actions/debian/preinst.ex
new file mode 100644
index 0000000000..b96e1f58d7
--- /dev/null
+++ b/sources/st2actions/debian/preinst.ex
@@ -0,0 +1,35 @@
+#!/bin/sh
+# preinst script for st2actions
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/sources/st2actions/debian/prerm.ex b/sources/st2actions/debian/prerm.ex
new file mode 100644
index 0000000000..8e3d564ec9
--- /dev/null
+++ b/sources/st2actions/debian/prerm.ex
@@ -0,0 +1,38 @@
+#!/bin/sh
+# prerm script for st2actions
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

From 816e38e513f8db0e136fc9ed8607787ceb7f58e6 Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Wed, 1 Jul 2015 17:36:16 +0300
Subject: [PATCH 03/42] game on

Cherry-picked from StackStorm/st2-packages@e2e71c15f5bede73e1498c1caf26a2bddb48e25c
---
 sources/st2actions/debian/postinst.ex | 39 ---------------------------
 sources/st2actions/debian/postrm.ex   | 37 -------------------------
 sources/st2actions/debian/preinst.ex  | 35 ------------------------
 sources/st2api/debian/postinst.ex     | 39 ---------------------------
 sources/st2api/debian/postrm.ex       | 37 -------------------------
 sources/st2api/debian/preinst.ex      | 35 ------------------------
 sources/st2api/debian/prerm.ex        | 38 --------------------------
 7 files changed, 260 deletions(-)
 delete mode 100644 sources/st2actions/debian/postinst.ex
 delete mode 100644 sources/st2actions/debian/postrm.ex
 delete mode 100644 sources/st2actions/debian/preinst.ex
 delete mode 100644 sources/st2api/debian/postinst.ex
 delete mode 100644 sources/st2api/debian/postrm.ex
 delete mode 100644 sources/st2api/debian/preinst.ex
 delete mode 100644 sources/st2api/debian/prerm.ex

diff --git a/sources/st2actions/debian/postinst.ex b/sources/st2actions/debian/postinst.ex
deleted file mode 100644
index 2a767e9c01..0000000000
--- a/sources/st2actions/debian/postinst.ex
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# postinst script for st2actions
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure)
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/sources/st2actions/debian/postrm.ex b/sources/st2actions/debian/postrm.ex
deleted file mode 100644
index ed8bffa37f..0000000000
--- a/sources/st2actions/debian/postrm.ex
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# postrm script for st2actions
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/sources/st2actions/debian/preinst.ex b/sources/st2actions/debian/preinst.ex
deleted file mode 100644
index b96e1f58d7..0000000000
--- a/sources/st2actions/debian/preinst.ex
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# preinst script for st2actions
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    install|upgrade)
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/sources/st2api/debian/postinst.ex b/sources/st2api/debian/postinst.ex
deleted file mode 100644
index b13772ed72..0000000000
--- a/sources/st2api/debian/postinst.ex
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# postinst script for st2api
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure)
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/sources/st2api/debian/postrm.ex b/sources/st2api/debian/postrm.ex
deleted file mode 100644
index 6605c16d0c..0000000000
--- a/sources/st2api/debian/postrm.ex
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# postrm script for st2api
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/sources/st2api/debian/preinst.ex b/sources/st2api/debian/preinst.ex
deleted file mode 100644
index 2b4b872c5a..0000000000
--- a/sources/st2api/debian/preinst.ex
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# preinst script for st2api
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    install|upgrade)
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/sources/st2api/debian/prerm.ex b/sources/st2api/debian/prerm.ex
deleted file mode 100644
index 995c1eb923..0000000000
--- a/sources/st2api/debian/prerm.ex
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# prerm script for st2api
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

From 1a8e6bb068c716f9f2a4db2090e4dc5cb6018454 Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Fri, 10 Jul 2015 21:37:38 +0300
Subject: [PATCH 04/42] removed st2action debian/*.ex

Cherry-picked from StackStorm/st2-packages@c71671bbeb0eb2a748ea639353c2e1c76e7e7ff3
---
 sources/st2actions/debian/prerm.ex | 38 ------------------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 sources/st2actions/debian/prerm.ex

diff --git a/sources/st2actions/debian/prerm.ex b/sources/st2actions/debian/prerm.ex
deleted file mode 100644
index 8e3d564ec9..0000000000
--- a/sources/st2actions/debian/prerm.ex
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# prerm script for st2actions
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

From 4057d1a160e1c48c5ca729a5d9af719bbfec15b0 Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Tue, 8 Sep 2015 01:53:30 +0300
Subject: [PATCH 05/42] initial st2bundle commit

Cherry-picked from StackStorm/st2-packages@8525ddb70e897932f9f3c61140099fdfc8aafeab
---
 sources/st2bundle/debian/postinst | 20 ++++++++++++++++++++
 sources/st2bundle/debian/postrm   | 25 +++++++++++++++++++++++++
 sources/st2bundle/debian/preinst  | 29 +++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 sources/st2bundle/debian/postinst
 create mode 100644 sources/st2bundle/debian/postrm
 create mode 100644 sources/st2bundle/debian/preinst

diff --git a/sources/st2bundle/debian/postinst b/sources/st2bundle/debian/postinst
new file mode 100644
index 0000000000..165611b86b
--- /dev/null
+++ b/sources/st2bundle/debian/postinst
@@ -0,0 +1,20 @@
+#!/bin/sh
+# postinst script for st2bundle
+#
+# see: dh_installdeb(1)
+
+set -e
+USER=st2
+chown $USER.$USER /var/log/st2
+if [ ! -f /etc/st2/htpasswd ]; then
+  touch /etc/st2/htpasswd
+  chown $USER.$USER /etc/st2/htpasswd
+  chmod 640 /etc/st2/htpasswd
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/sources/st2bundle/debian/postrm b/sources/st2bundle/debian/postrm
new file mode 100644
index 0000000000..ddcbea86f4
--- /dev/null
+++ b/sources/st2bundle/debian/postrm
@@ -0,0 +1,25 @@
+#!/bin/sh
+# postrm script for st2bundle
+#
+# see: dh_installdeb(1)
+
+set -e
+
+if [ "$1" = "remove" ]; then
+  [ -f /etc/logrotate.d/st2 ] && mv -f /etc/logrotate.d/st2 /etc/logrotate.d/st2.disabled
+fi
+
+if [ "$1" = "purge" -o "$1" = "dissappear" ]; then
+  [ -f /etc/logrotate.d/st2.disabled ] && rm -f /etc/logrotate.d/st2.disabled
+fi
+
+# case "$1" in
+#     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+#     ;;
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/sources/st2bundle/debian/preinst b/sources/st2bundle/debian/preinst
new file mode 100644
index 0000000000..c894eca1a7
--- /dev/null
+++ b/sources/st2bundle/debian/preinst
@@ -0,0 +1,29 @@
+#!/bin/sh
+# preinst script for st2bundle
+#
+# see: dh_installdeb(1)
+
+set -e
+
+if [ "$1" = "install" -a -n "$2" ] ; then
+  [ -f /etc/logrotate.d/st2.disabled ] && mv -f /etc/logrotate.d/st2.disabled /etc/logrotate.d/st2
+fi
+
+# Create st2 users
+adduser --group --disabled-password --no-create-home --system st2 >/dev/null 2>&1
+adduser --group stanley >/dev/null 2>&1
+adduser --disabled-password --ingroup stanley stanley >/dev/null 2>&1
+
+# case "$1" in
+#     install|upgrade)
+#     ;;
+
+#     abort-upgrade)
+#     ;;
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

From 265c178dc619eb19c5837c059c1b998b2eedcfcc Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Thu, 10 Sep 2015 20:13:53 +0300
Subject: [PATCH 06/42] moving sources to st2 directory

Cherry-picked from StackStorm/st2-packages@f2d180832150f457ced2adee9efd8a53ea52274b
---
 {sources => st2}/st2bundle/debian/postinst | 0
 {sources => st2}/st2bundle/debian/postrm   | 0
 {sources => st2}/st2bundle/debian/preinst  | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename {sources => st2}/st2bundle/debian/postinst (100%)
 rename {sources => st2}/st2bundle/debian/postrm (100%)
 rename {sources => st2}/st2bundle/debian/preinst (100%)

diff --git a/sources/st2bundle/debian/postinst b/st2/st2bundle/debian/postinst
similarity index 100%
rename from sources/st2bundle/debian/postinst
rename to st2/st2bundle/debian/postinst
diff --git a/sources/st2bundle/debian/postrm b/st2/st2bundle/debian/postrm
similarity index 100%
rename from sources/st2bundle/debian/postrm
rename to st2/st2bundle/debian/postrm
diff --git a/sources/st2bundle/debian/preinst b/st2/st2bundle/debian/preinst
similarity index 100%
rename from sources/st2bundle/debian/preinst
rename to st2/st2bundle/debian/preinst

From faa8a5823b2626b4ea5d176fc9c77e1725e08756 Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Fri, 30 Oct 2015 20:41:02 +0300
Subject: [PATCH 07/42] moving all packages into packages/

Cherry-picked from StackStorm/st2-packages@02e88684f8535cf10f9a05cfa7502c95bbd4546d
---
 {st2 => packages}/st2bundle/debian/postinst | 0
 {st2 => packages}/st2bundle/debian/postrm   | 0
 {st2 => packages}/st2bundle/debian/preinst  | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename {st2 => packages}/st2bundle/debian/postinst (100%)
 rename {st2 => packages}/st2bundle/debian/postrm (100%)
 rename {st2 => packages}/st2bundle/debian/preinst (100%)

diff --git a/st2/st2bundle/debian/postinst b/packages/st2bundle/debian/postinst
similarity index 100%
rename from st2/st2bundle/debian/postinst
rename to packages/st2bundle/debian/postinst
diff --git a/st2/st2bundle/debian/postrm b/packages/st2bundle/debian/postrm
similarity index 100%
rename from st2/st2bundle/debian/postrm
rename to packages/st2bundle/debian/postrm
diff --git a/st2/st2bundle/debian/preinst b/packages/st2bundle/debian/preinst
similarity index 100%
rename from st2/st2bundle/debian/preinst
rename to packages/st2bundle/debian/preinst

From e9652d0649a8b3697a20450f0645bc0005ca75ec Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Sat, 7 Nov 2015 21:16:37 +0300
Subject: [PATCH 08/42] added buildnode var and fixed debian/preinst for
 st2bundle

Cherry-picked from StackStorm/st2-packages@7cfe181ae97012246dc73115895c71398c655ebe
---
 packages/st2bundle/debian/preinst | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/st2bundle/debian/preinst b/packages/st2bundle/debian/preinst
index c894eca1a7..d2031c126e 100644
--- a/packages/st2bundle/debian/preinst
+++ b/packages/st2bundle/debian/preinst
@@ -4,15 +4,21 @@
 # see: dh_installdeb(1)
 
 set -e
+exec >/dev/null
 
 if [ "$1" = "install" -a -n "$2" ] ; then
   [ -f /etc/logrotate.d/st2.disabled ] && mv -f /etc/logrotate.d/st2.disabled /etc/logrotate.d/st2
 fi
 
 # Create st2 users
-adduser --group --disabled-password --no-create-home --system st2 >/dev/null 2>&1
-adduser --group stanley >/dev/null 2>&1
-adduser --disabled-password --ingroup stanley stanley >/dev/null 2>&1
+if (! id st2 2>/dev/null); then
+  adduser --group --disabled-password --no-create-home --system st2
+fi
+
+if (! id stanley 2>/dev/null); then
+  adduser --group stanley
+  adduser --disabled-password --gecos "" --ingroup stanley stanley
+fi
 
 # case "$1" in
 #     install|upgrade)

From c6adfe12e03252361e1bed03318b79d9da67f5f9 Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Fri, 22 Jan 2016 20:57:15 +0700
Subject: [PATCH 09/42] minor permission fixes and cleanups for bundle

Cherry-picked from StackStorm/st2-packages@504e740df63eb5a4ed612cb880b0424eaee0fb41
---
 packages/st2bundle/debian/postinst | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/st2bundle/debian/postinst b/packages/st2bundle/debian/postinst
index 165611b86b..a90f8930e5 100644
--- a/packages/st2bundle/debian/postinst
+++ b/packages/st2bundle/debian/postinst
@@ -5,12 +5,10 @@
 
 set -e
 USER=st2
-chown $USER.$USER /var/log/st2
-if [ ! -f /etc/st2/htpasswd ]; then
-  touch /etc/st2/htpasswd
-  chown $USER.$USER /etc/st2/htpasswd
-  chmod 640 /etc/st2/htpasswd
-fi
+ST2_OWNED="/etc/st2/htpasswd /var/log/st2"
+
+# Mind that ST2_OWNED paths have to exist, i.e should be installed by package
+echo $ST2_OWNED | xargs -n1 chown $USER:$USER
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.

From 6683d7e874f9928c87f23d5c542d3c26417c7f7f Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Sat, 30 Jan 2016 14:39:15 +0700
Subject: [PATCH 10/42] st2bundle renamed to st2

Cherry-picked from StackStorm/st2-packages@b74e98fb22652d8f2da6ac2643106c83aff2d3b7
---
 packages/{st2bundle => st2}/debian/postinst | 2 +-
 packages/{st2bundle => st2}/debian/postrm   | 2 +-
 packages/{st2bundle => st2}/debian/preinst  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/{st2bundle => st2}/debian/postinst (91%)
 rename packages/{st2bundle => st2}/debian/postrm (94%)
 rename packages/{st2bundle => st2}/debian/preinst (95%)

diff --git a/packages/st2bundle/debian/postinst b/packages/st2/debian/postinst
similarity index 91%
rename from packages/st2bundle/debian/postinst
rename to packages/st2/debian/postinst
index a90f8930e5..21818bbc75 100644
--- a/packages/st2bundle/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for st2bundle
+# postinst script for st2
 #
 # see: dh_installdeb(1)
 
diff --git a/packages/st2bundle/debian/postrm b/packages/st2/debian/postrm
similarity index 94%
rename from packages/st2bundle/debian/postrm
rename to packages/st2/debian/postrm
index ddcbea86f4..8f17785b42 100644
--- a/packages/st2bundle/debian/postrm
+++ b/packages/st2/debian/postrm
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postrm script for st2bundle
+# postrm script for st2
 #
 # see: dh_installdeb(1)
 
diff --git a/packages/st2bundle/debian/preinst b/packages/st2/debian/preinst
similarity index 95%
rename from packages/st2bundle/debian/preinst
rename to packages/st2/debian/preinst
index d2031c126e..0ff583c581 100644
--- a/packages/st2bundle/debian/preinst
+++ b/packages/st2/debian/preinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-# preinst script for st2bundle
+# preinst script for st2
 #
 # see: dh_installdeb(1)
 

From 843c7262f47b04a883ca63ad21144bf00928be59 Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Wed, 2 Mar 2016 15:45:25 +0700
Subject: [PATCH 11/42] running actionrunner as root:st2packs with umask 002 to
 provide group writeable access

Cherry-picked from StackStorm/st2-packages@0fcda8833f33b1a07f2f02a2f613753237d10640
---
 packages/st2/debian/postinst | 21 +++++++++++++++++----
 packages/st2/debian/preinst  |  8 +++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index 21818bbc75..8aaf6ff767 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -4,11 +4,24 @@
 # see: dh_installdeb(1)
 
 set -e
-USER=st2
-ST2_OWNED="/etc/st2/htpasswd /var/log/st2"
+ST2_USER=st2
+SYS_USER=stanley
 
-# Mind that ST2_OWNED paths have to exist, i.e should be installed by package
-echo $ST2_OWNED | xargs -n1 chown $USER:$USER
+PERMS=$(cat <<EHD
+/etc/st2/htpasswd             ${ST2_USER}:${ST2_USER} 600
+/opt/stackstorm/exports       ${ST2_USER}:${ST2_USER} 755
+/opt/stackstorm/packs         ${SYS_USER}:${ST2_USER} 775
+/opt/stackstorm/virtualenvs   ${SYS_USER}:${ST2_USER} 775
+/var/log/st2                  ${ST2_USER}:${ST2_USER} 775
+EHD
+)
+
+echo "$PERMS" | while read line; do
+  path=`echo $line | cut -f1 -d' '`
+  creds=`echo $line | cut -f2 -d' '`
+  mode=`echo $line | cut -f3 -d' '`
+  chown -f $creds $path && chmod -f $mode $path
+done
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
diff --git a/packages/st2/debian/preinst b/packages/st2/debian/preinst
index 0ff583c581..e72df1e1c9 100644
--- a/packages/st2/debian/preinst
+++ b/packages/st2/debian/preinst
@@ -5,6 +5,8 @@
 
 set -e
 exec >/dev/null
+ST2_USER=st2
+SYS_USER=stanley
 
 if [ "$1" = "install" -a -n "$2" ] ; then
   [ -f /etc/logrotate.d/st2.disabled ] && mv -f /etc/logrotate.d/st2.disabled /etc/logrotate.d/st2
@@ -12,12 +14,12 @@ fi
 
 # Create st2 users
 if (! id st2 2>/dev/null); then
-  adduser --group --disabled-password --no-create-home --system st2
+  adduser --group --disabled-password --no-create-home --system $ST2_USER
 fi
 
-if (! id stanley 2>/dev/null); then
+if (! id $SYS_USER 2>/dev/null); then
   adduser --group stanley
-  adduser --disabled-password --gecos "" --ingroup stanley stanley
+  adduser --disabled-password --gecos "" --ingroup $SYS_USER $SYS_USER
 fi
 
 # case "$1" in

From 1a87a24b3e5244ddc595e73cc8f3fc570080b138 Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Wed, 2 Mar 2016 00:17:55 +0700
Subject: [PATCH 12/42] debian maintainer scripts update, reown
 packs/virtualenvs on upgrade (if required)

Cherry-picked from StackStorm/st2-packages@a441bd71606421b01b6516a8fa587feb460b11c1
---
 packages/st2/debian/postinst |  60 ++++++++++++++-----
 packages/st2/debian/postrm   |  40 ++++++++++---
 packages/st2/debian/preinst  | 109 +++++++++++++++++++++++++++++------
 3 files changed, 169 insertions(+), 40 deletions(-)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index 8aaf6ff767..d3eed1c119 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -4,24 +4,58 @@
 # see: dh_installdeb(1)
 
 set -e
-ST2_USER=st2
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
 SYS_USER=stanley
+ST2_USER=st2
+ST2_UPGRADESTAMP="/tmp/.stamp-stackstorm-st2-deb-package"
+upgrading=0
 
-PERMS=$(cat <<EHD
-/etc/st2/htpasswd             ${ST2_USER}:${ST2_USER} 600
-/opt/stackstorm/exports       ${ST2_USER}:${ST2_USER} 755
-/opt/stackstorm/packs         ${SYS_USER}:${ST2_USER} 775
-/opt/stackstorm/virtualenvs   ${SYS_USER}:${ST2_USER} 775
-/var/log/st2                  ${ST2_USER}:${ST2_USER} 775
+## Permissions of files which should be set on install
+DEST_PERMS=$(cat <<EHD | sed 's/\s\+/ /g'
+ug+rw _sysuser:_st2user /opt/stackstorm/packs
+ug+rw _sysuser:_st2user /opt/stackstorm/virtualenvs
+ug+rw _st2user:_st2user /var/log/st2
+755 _st2user:root       /opt/stackstorm/exports
+600 _st2user:_st2user   /etc/st2/htpasswd
 EHD
 )
 
-echo "$PERMS" | while read line; do
-  path=`echo $line | cut -f1 -d' '`
-  creds=`echo $line | cut -f2 -d' '`
-  mode=`echo $line | cut -f3 -d' '`
-  chown -f $creds $path && chmod -f $mode $path
-done
+## Fix directories permissions on install (different across maint scripts!)
+set_permissions() {
+  local fileperms="$1"
+  fileperms=$(echo "$fileperms" | sed -e "s/_sysuser/$SYS_USER/g" -e "s/_st2user/$ST2_USER/g")
+  # Reqursively chown given destinations!
+  echo "$fileperms" | cut -f2,3 -d' ' | xargs -n2 chown -R
+  # Set directories mode
+  echo "$fileperms" | cut -f1,3 -d' ' | xargs -n2 chmod -R
+}
+
+case "$1" in
+    configure)
+      # Initially set destination files owenership (only on the first install)
+      [ -f $ST2_UPGRADESTAMP ] && upgrading=1 && rm $ST2_UPGRADESTAMP || :
+      [ "$upgrading" = 0 ] && set_permissions "$DEST_PERMS" || :
+    ;;
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
diff --git a/packages/st2/debian/postrm b/packages/st2/debian/postrm
index 8f17785b42..cf9b760e24 100644
--- a/packages/st2/debian/postrm
+++ b/packages/st2/debian/postrm
@@ -5,17 +5,39 @@
 
 set -e
 
-if [ "$1" = "remove" ]; then
-  [ -f /etc/logrotate.d/st2 ] && mv -f /etc/logrotate.d/st2 /etc/logrotate.d/st2.disabled
-fi
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
 
-if [ "$1" = "purge" -o "$1" = "dissappear" ]; then
-  [ -f /etc/logrotate.d/st2.disabled ] && rm -f /etc/logrotate.d/st2.disabled
-fi
+## Save st2 logrotate config on remove, but wipe it out on purge.
+preserve_logrotate() {
+  if [ "$1" = remove ]; then
+    [ -f /etc/logrotate.d/st2 ] && mv /etc/logrotate.d/st2-pkgsaved.disabled 1>/dev/null 2>&1 || :
+  elif [ "$1" = purge ]; then
+    rm -f /etc/logrotate.d/st2-pkgsaved.disabled 1>/dev/null 2>&1 || :
+  fi
+}
 
-# case "$1" in
-#     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-#     ;;
+case "$1" in
+    remove|purge)
+      preserve_logrotate "$1"
+    ;;
+    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
diff --git a/packages/st2/debian/preinst b/packages/st2/debian/preinst
index e72df1e1c9..3fccec9f42 100644
--- a/packages/st2/debian/preinst
+++ b/packages/st2/debian/preinst
@@ -4,30 +4,103 @@
 # see: dh_installdeb(1)
 
 set -e
-exec >/dev/null
-ST2_USER=st2
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
 SYS_USER=stanley
+ST2_USER=st2
+ST2_CONFPATH="/etc/st2/st2.conf"
+ST2_UPGRADESTAMP="/tmp/.stamp-stackstorm-st2-deb-package"
+
+## Permissions of directories which has to be reset on upgrade
+RESET_PERMS=$(cat <<EHD | sed 's/\s\+/ /g'
+ug+rw _sysuser:_st2user /opt/stackstorm/packs
+ug+rw _sysuser:_st2user /opt/stackstorm/virtualenvs
+ug+rw _st2user:_st2user /var/log/st2
+755   _st2user:root     /opt/stackstorm/exports
+EHD
+)
 
-if [ "$1" = "install" -a -n "$2" ] ; then
-  [ -f /etc/logrotate.d/st2.disabled ] && mv -f /etc/logrotate.d/st2.disabled /etc/logrotate.d/st2
-fi
+## Create stackstorm users and groups
+create_users() {
+  exec >/dev/null
+  # create st2 user (for services run with its privileges)
+  if (! id $ST2_USER 1>/dev/null 2>&1); then
+    adduser --group --disabled-password --no-create-home --system $ST2_USER
+  fi
+  # create stanley user (for actionrunner service)
+  if (! id $SYS_USER 1>/dev/null 2>&1); then
+    adduser --group $SYS_USER
+    adduser --disabled-password --gecos "" --ingroup $SYS_USER $SYS_USER
+  fi
+  exec >$(tty) || :
+}
+
+## Get current system user from the st2.conf
+config_sysuser() {
+  local sysuser=
+  if [ -f $ST2_CONFPATH ]; then
+    sysuser=$(cat $ST2_CONFPATH |
+      sed -n -e '/\[system_user\]/,/\[.*\]\|\$/ { /\[.*\]/d; /user\s*=/ { s/\s*user\s*=\s*//; p } }')
+  fi
+  echo $sysuser
+}
+
+## Update logrotate configuration
+enable_logrotate() {
+  [ -f /etc/logrotate.d/st2-pkgsaved.disabled ] &&
+    mv -f /etc/logrotate.d/st2-pkgsaved.disabled /etc/logrotate.d/st2 || :
+}
+
+## Fix directories permissions on upgrade (different across maint scripts!)
+#    Current system_user is auto-detected, so it definitly should go smooth.
+#    However the same can not be said about st2 user (in case if user customises
+#    services startup user, then well we don't care :)
+#
+set_permissions() {
+  local fileperms="$1" mode= ownership= path= current_ownership=
 
-# Create st2 users
-if (! id st2 2>/dev/null); then
-  adduser --group --disabled-password --no-create-home --system $ST2_USER
-fi
+  echo "$fileperms" | sed -e "s/_sysuser/$CONFIG_SYSUSER/g" -e "s/_st2user/$ST2_USER/g" | 
+  while read mode ownership path; do
+    current_ownership=$(stat -c '%U:%G' $path)
 
-if (! id $SYS_USER 2>/dev/null); then
-  adduser --group stanley
-  adduser --disabled-password --gecos "" --ingroup $SYS_USER $SYS_USER
-fi
+    # Do not upgrade ownership on each upgrade just do it during the first one
+    if [ "$current_ownership" != "$ownership" ]; then
+      # Recursively own path (in case it's a directory) 
+      chown -R $ownership $path
+      chmod -R $mode $path
+    fi
+  done
+}
 
-# case "$1" in
-#     install|upgrade)
-#     ;;
+# Get current system_user from st2.conf
+CONFIG_SYSUSER=$(config_sysuser)
+: ${CONFIG_SYSUSER:=stanley}
 
-#     abort-upgrade)
-#     ;;
+case "$1" in
+    install)
+      create_users
+      enable_logrotate
+    ;;
+    upgrade)
+      create_users
+      enable_logrotate
+      set_permissions "$RESET_PERMS"
+      touch $ST2_UPGRADESTAMP
+    ;;
+    abort-upgrade)
+    ;;
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.

From 2c739a943a9ea5a54f37d9e775706785b6a46562 Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Wed, 2 Mar 2016 17:04:53 +0700
Subject: [PATCH 13/42] st2packs group is used in debian maintainer scripts

Cherry-picked from StackStorm/st2-packages@6ee05e5755d7799242a52103ef13e094f12f9493
---
 packages/st2/debian/postinst | 14 +++++++-------
 packages/st2/debian/preinst  | 33 ++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index d3eed1c119..8d3484b7a7 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -17,25 +17,25 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-SYS_USER=stanley
 ST2_USER=st2
+PACKS_GROUP=st2packs
 ST2_UPGRADESTAMP="/tmp/.stamp-stackstorm-st2-deb-package"
 upgrading=0
 
 ## Permissions of files which should be set on install
 DEST_PERMS=$(cat <<EHD | sed 's/\s\+/ /g'
-ug+rw _sysuser:_st2user /opt/stackstorm/packs
-ug+rw _sysuser:_st2user /opt/stackstorm/virtualenvs
-ug+rw _st2user:_st2user /var/log/st2
-755 _st2user:root       /opt/stackstorm/exports
-600 _st2user:_st2user   /etc/st2/htpasswd
+ug+rw root:_packsgroup /opt/stackstorm/packs
+ug+rw root:_packsgroup /opt/stackstorm/virtualenvs
+755 _st2user:root      /opt/stackstorm/exports
+755 _st2user:_st2user  /var/log/st2
+600 _st2user:_st2user  /etc/st2/htpasswd
 EHD
 )
 
 ## Fix directories permissions on install (different across maint scripts!)
 set_permissions() {
   local fileperms="$1"
-  fileperms=$(echo "$fileperms" | sed -e "s/_sysuser/$SYS_USER/g" -e "s/_st2user/$ST2_USER/g")
+  fileperms=$(echo "$fileperms" | sed -e "s/_st2user/$ST2_USER/g" -e "s/_packsgroup/$PACKS_GROUP/g")
   # Reqursively chown given destinations!
   echo "$fileperms" | cut -f2,3 -d' ' | xargs -n2 chown -R
   # Set directories mode
diff --git a/packages/st2/debian/preinst b/packages/st2/debian/preinst
index 3fccec9f42..ca94c1a9b5 100644
--- a/packages/st2/debian/preinst
+++ b/packages/st2/debian/preinst
@@ -13,6 +13,7 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+PACKS_GROUP=st2packs
 SYS_USER=stanley
 ST2_USER=st2
 ST2_CONFPATH="/etc/st2/st2.conf"
@@ -20,30 +21,34 @@ ST2_UPGRADESTAMP="/tmp/.stamp-stackstorm-st2-deb-package"
 
 ## Permissions of directories which has to be reset on upgrade
 RESET_PERMS=$(cat <<EHD | sed 's/\s\+/ /g'
-ug+rw _sysuser:_st2user /opt/stackstorm/packs
-ug+rw _sysuser:_st2user /opt/stackstorm/virtualenvs
-ug+rw _st2user:_st2user /var/log/st2
-755   _st2user:root     /opt/stackstorm/exports
+ug+rw root:_packsgroup /opt/stackstorm/packs
+ug+rw root:_packsgroup /opt/stackstorm/virtualenvs
+755 _st2user:root      /opt/stackstorm/exports
 EHD
 )
 
 ## Create stackstorm users and groups
 create_users() {
   exec >/dev/null
-  # create st2 user (for services run with its privileges)
-  if (! id $ST2_USER 1>/dev/null 2>&1); then
+  # create st2 user (services user)
+  (id $ST2_USER 2>/dev/null) ||
     adduser --group --disabled-password --no-create-home --system $ST2_USER
-  fi
+  # make st2 member of st2packs group
+  (getent group $PACKS_GROUP 2>/dev/null) || groupadd -r $PACKS_GROUP
+  (groups $ST2_USER 2>/dev/null | grep -q "\b${PACKS_GROUP}\b") ||
+    usermod -a -G $PACKS_GROUP $ST2_USER
   # create stanley user (for actionrunner service)
-  if (! id $SYS_USER 1>/dev/null 2>&1); then
+  if (! id $SYS_USER 2>/dev/null); then
     adduser --group $SYS_USER
     adduser --disabled-password --gecos "" --ingroup $SYS_USER $SYS_USER
   fi
   exec >$(tty) || :
 }
 
-## Get current system user from the st2.conf
+## [NOT USED!] Get current system user from the st2.conf
 config_sysuser() {
+  # exit hooked
+  return 0
   local sysuser=
   if [ -f $ST2_CONFPATH ]; then
     sysuser=$(cat $ST2_CONFPATH |
@@ -59,14 +64,12 @@ enable_logrotate() {
 }
 
 ## Fix directories permissions on upgrade (different across maint scripts!)
-#    Current system_user is auto-detected, so it definitly should go smooth.
-#    However the same can not be said about st2 user (in case if user customises
-#    services startup user, then well we don't care :)
+#  (!USED FOR COMPATIBILITY ON UPGRADE FROM PREVIOUS VERSIONS OF PACKAGES!)
 #
 set_permissions() {
   local fileperms="$1" mode= ownership= path= current_ownership=
 
-  echo "$fileperms" | sed -e "s/_sysuser/$CONFIG_SYSUSER/g" -e "s/_st2user/$ST2_USER/g" | 
+  echo "$fileperms" | sed -e "s/_packsgroup/$PACKS_GROUP/g" -e "s/_st2user/$ST2_USER/g" |
   while read mode ownership path; do
     current_ownership=$(stat -c '%U:%G' $path)
 
@@ -79,10 +82,6 @@ set_permissions() {
   done
 }
 
-# Get current system_user from st2.conf
-CONFIG_SYSUSER=$(config_sysuser)
-: ${CONFIG_SYSUSER:=stanley}
-
 case "$1" in
     install)
       create_users

From acb873ab48bbab9ce78904dae34d739915078c19 Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Wed, 2 Mar 2016 20:19:10 +0700
Subject: [PATCH 14/42] rpm preinst hook separted into a file

Cherry-picked from StackStorm/st2-packages@db443c10ff334984a0cb40c0f20e04b9a54522ce
---
 packages/st2/rpm/preinst_script.spec | 55 ++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 packages/st2/rpm/preinst_script.spec

diff --git a/packages/st2/rpm/preinst_script.spec b/packages/st2/rpm/preinst_script.spec
new file mode 100644
index 0000000000..59380e3d71
--- /dev/null
+++ b/packages/st2/rpm/preinst_script.spec
@@ -0,0 +1,55 @@
+set -e
+
+PACKS_GROUP=%{packs_group}
+SYS_USER=%{stanley_user}
+ST2_USER=%{svc_user}
+
+## Permissions of directories which has to be reset on upgrade
+RESET_PERMS=$(cat <<EHD | sed 's/\s\+/ /g'
+ug+rw root:_packsgroup /opt/stackstorm/packs
+ug+rw root:_packsgroup /opt/stackstorm/virtualenvs
+755 _st2user:root      /opt/stackstorm/exports
+EHD
+)
+
+## Create stackstorm users and groups (differs from debian)
+create_users() {
+  # create st2 user (services user)
+  (id $ST2_USER 1>/dev/null 2>&1) ||
+    adduser --no-create-home --system $ST2_USER
+
+  # make st2 member of st2packs group
+  (getent group $PACKS_GROUP 1>/dev/null 2>&1) || groupadd -r $PACKS_GROUP
+  (groups $ST2_USER 2>/dev/null | grep -q "\b${PACKS_GROUP}\b") ||
+    usermod -a -G $PACKS_GROUP $ST2_USER
+
+  # create stanley user (unprivileged action user, we don't ship sudoers.d config)
+  (id $SYS_USER 1>/dev/null 2>&1) ||
+    adduser --user-group $SYS_USER
+}
+
+## Fix directories permissions on upgrade (different across maint scripts!)
+#  (!USED FOR COMPATIBILITY ON UPGRADE FROM PREVIOUS VERSIONS OF PACKAGES!)
+#
+set_permissions() {
+  local fileperms="$1" mode= ownership= path= current_ownership=
+
+  echo "$fileperms" | sed -e "s/_packsgroup/$PACKS_GROUP/g" -e "s/_st2user/$ST2_USER/g" |
+  while read mode ownership path; do
+    current_ownership=$(stat -c '%U:%G' $path)
+
+    # Do not upgrade ownership on each upgrade just do it during the first one
+    if [ "$current_ownership" != "$ownership" ]; then
+      # Recursively own path (in case it's a directory) 
+      chown -R $ownership $path
+      chmod -R $mode $path
+    fi
+  done
+}
+
+create_users
+
+# We perform upgrade (when install count > 1)
+if [ "$1" -ge 1 ]; then
+  set_permissions "$RESET_PERMS"
+fi

From 665811747a0bcbe0dfa896a88f742d4b9b169579 Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Wed, 2 Mar 2016 22:39:51 +0700
Subject: [PATCH 15/42] verbosity on when creating users/groups on debian (same
 way as rabbit and mongo do)

Cherry-picked from StackStorm/st2-packages@bdd24b775addd03377cee6fc030354b091593791
---
 packages/st2/debian/preinst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/st2/debian/preinst b/packages/st2/debian/preinst
index ca94c1a9b5..dc485a402e 100644
--- a/packages/st2/debian/preinst
+++ b/packages/st2/debian/preinst
@@ -29,20 +29,20 @@ EHD
 
 ## Create stackstorm users and groups
 create_users() {
-  exec >/dev/null
   # create st2 user (services user)
-  (id $ST2_USER 2>/dev/null) ||
+  (id $ST2_USER 1>/dev/null 2>&1) ||
     adduser --group --disabled-password --no-create-home --system $ST2_USER
+
   # make st2 member of st2packs group
-  (getent group $PACKS_GROUP 2>/dev/null) || groupadd -r $PACKS_GROUP
+  (getent group $PACKS_GROUP 1>/dev/null 2>&1) || groupadd -r $PACKS_GROUP
   (groups $ST2_USER 2>/dev/null | grep -q "\b${PACKS_GROUP}\b") ||
     usermod -a -G $PACKS_GROUP $ST2_USER
+
   # create stanley user (for actionrunner service)
-  if (! id $SYS_USER 2>/dev/null); then
+  if (! id $SYS_USER 1>/dev/null 2>&1); then
     adduser --group $SYS_USER
     adduser --disabled-password --gecos "" --ingroup $SYS_USER $SYS_USER
   fi
-  exec >$(tty) || :
 }
 
 ## [NOT USED!] Get current system user from the st2.conf

From 37c120df8f68a33af7e6e1d71274fc45e0eae931 Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Thu, 3 Mar 2016 01:53:40 +0700
Subject: [PATCH 16/42] reseting permissions on upgrade using find opertaion
 (rpms require children checks)

Cherry-picked from StackStorm/st2-packages@e1b64899d50eb7480377902fe33008fda0cef637
---
 packages/st2/debian/preinst          | 22 ++++++++++++----------
 packages/st2/rpm/preinst_script.spec | 22 ++++++++++++----------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/packages/st2/debian/preinst b/packages/st2/debian/preinst
index dc485a402e..bcec1431ec 100644
--- a/packages/st2/debian/preinst
+++ b/packages/st2/debian/preinst
@@ -64,21 +64,23 @@ enable_logrotate() {
 }
 
 ## Fix directories permissions on upgrade (different across maint scripts!)
-#  (!USED FOR COMPATIBILITY ON UPGRADE FROM PREVIOUS VERSIONS OF PACKAGES!)
+#  NB! USED FOR COMPATIBILITY ON UPGRADE FROM PREVIOUS VERSIONS OF PACKAGES.
+#  NB! In future package releases reseting permissions SHOULD BE REMOVED.
 #
 set_permissions() {
-  local fileperms="$1" mode= ownership= path= current_ownership=
+  local fileperms="$1" mode= ownership= path= current_ownership= user= group=
 
   echo "$fileperms" | sed -e "s/_packsgroup/$PACKS_GROUP/g" -e "s/_st2user/$ST2_USER/g" |
   while read mode ownership path; do
-    current_ownership=$(stat -c '%U:%G' $path)
-
-    # Do not upgrade ownership on each upgrade just do it during the first one
-    if [ "$current_ownership" != "$ownership" ]; then
-      # Recursively own path (in case it's a directory) 
-      chown -R $ownership $path
-      chmod -R $mode $path
-    fi
+    user=$(echo $ownership | cut -f1 -d:)
+    group=$(echo $ownership | cut -f2 -d:)
+    # set top level permissions whether it's a file or directory
+    [ -e $path ] || continue
+    chown $ownership $path && chmod $mode $path
+
+    # recursively change permissions of children (since those are directories)
+    find $path -mindepth 1 -maxdepth 1 -not \( -user $user -group $group \) |
+      xargs -I {} sh -c "echo chown -R $ownership {} && echo chmod -R $mode {}"
   done
 }
 
diff --git a/packages/st2/rpm/preinst_script.spec b/packages/st2/rpm/preinst_script.spec
index 59380e3d71..ec03376cac 100644
--- a/packages/st2/rpm/preinst_script.spec
+++ b/packages/st2/rpm/preinst_script.spec
@@ -29,21 +29,23 @@ create_users() {
 }
 
 ## Fix directories permissions on upgrade (different across maint scripts!)
-#  (!USED FOR COMPATIBILITY ON UPGRADE FROM PREVIOUS VERSIONS OF PACKAGES!)
+#  NB! USED FOR COMPATIBILITY ON UPGRADE FROM PREVIOUS VERSIONS OF PACKAGES.
+#  NB! In future package releases reseting permissions SHOULD BE REMOVED.
 #
 set_permissions() {
-  local fileperms="$1" mode= ownership= path= current_ownership=
+  local fileperms="$1" mode= ownership= path= current_ownership= user= group=
 
   echo "$fileperms" | sed -e "s/_packsgroup/$PACKS_GROUP/g" -e "s/_st2user/$ST2_USER/g" |
   while read mode ownership path; do
-    current_ownership=$(stat -c '%U:%G' $path)
-
-    # Do not upgrade ownership on each upgrade just do it during the first one
-    if [ "$current_ownership" != "$ownership" ]; then
-      # Recursively own path (in case it's a directory) 
-      chown -R $ownership $path
-      chmod -R $mode $path
-    fi
+    user=$(echo $ownership | cut -f1 -d:)
+    group=$(echo $ownership | cut -f2 -d:)
+    # set top level permissions whether it's a file or directory
+    [ -e $path ] || continue
+    chown $ownership $path && chmod $mode $path
+
+    # recursively change permissions of children (since those are directories)
+    find $path -mindepth 1 -maxdepth 1 -not \( -user $user -group $group \) |
+      xargs -I {} sh -c "chown -R $ownership {} && chmod -R $mode {}"
   done
 }
 

From b453ecf80f914b0352ec947c947e6c2e89a373f1 Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Fri, 4 Mar 2016 21:09:40 +0700
Subject: [PATCH 17/42] minor permission fixes

Cherry-picked from StackStorm/st2-packages@8b844a68e03731bed14d38ed2ccac2558743c7ec
---
 packages/st2/debian/postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index 8d3484b7a7..6c5fb43260 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -27,7 +27,7 @@ DEST_PERMS=$(cat <<EHD | sed 's/\s\+/ /g'
 ug+rw root:_packsgroup /opt/stackstorm/packs
 ug+rw root:_packsgroup /opt/stackstorm/virtualenvs
 755 _st2user:root      /opt/stackstorm/exports
-755 _st2user:_st2user  /var/log/st2
+755 _st2user:root      /var/log/st2
 600 _st2user:_st2user  /etc/st2/htpasswd
 EHD
 )

From 0321b3181fc6a97b1b9bb3beff7bda9c70ca2544 Mon Sep 17 00:00:00 2001
From: Denis Baryshev <dennybaa@gmail.com>
Date: Mon, 7 Mar 2016 16:11:06 +0700
Subject: [PATCH 18/42] debian postinst only permission setting (support
 recursive mode for non-empty dirs such as packs)

Cherry-picked from StackStorm/st2-packages@12e671ae7972be257492e53ec9200fba68363382
---
 packages/st2/debian/postinst | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index 6c5fb43260..7e02e7d1dc 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -23,12 +23,13 @@ ST2_UPGRADESTAMP="/tmp/.stamp-stackstorm-st2-deb-package"
 upgrading=0
 
 ## Permissions of files which should be set on install
-DEST_PERMS=$(cat <<EHD | sed 's/\s\+/ /g'
-ug+rw root:_packsgroup /opt/stackstorm/packs
-ug+rw root:_packsgroup /opt/stackstorm/virtualenvs
-755 _st2user:root      /opt/stackstorm/exports
-755 _st2user:root      /var/log/st2
-600 _st2user:_st2user  /etc/st2/htpasswd
+SET_PERMS=$(cat <<EHD | sed 's/\s\+/ /g'
+-R ug+rw root:_packsgroup /opt/stackstorm/packs
+   ug+rw root:_packsgroup /opt/stackstorm/virtualenvs
+   755 _st2user:root      /opt/stackstorm/exports
+   755 _st2user:root      /var/log/st2
+   755 _st2user:root      /var/run/st2
+   600 _st2user:_st2user  /etc/st2/htpasswd
 EHD
 )
 
@@ -37,16 +38,19 @@ set_permissions() {
   local fileperms="$1"
   fileperms=$(echo "$fileperms" | sed -e "s/_st2user/$ST2_USER/g" -e "s/_packsgroup/$PACKS_GROUP/g")
   # Reqursively chown given destinations!
-  echo "$fileperms" | cut -f2,3 -d' ' | xargs -n2 chown -R
+  echo "$fileperms" | cut -f1,3,4 -d' ' | xargs -L1 chown
   # Set directories mode
-  echo "$fileperms" | cut -f1,3 -d' ' | xargs -n2 chmod -R
+  echo "$fileperms" | cut -f1,2,4 -d' ' | xargs -L1 chmod
 }
 
+# Choose first install or upgrade
+[ -f $ST2_UPGRADESTAMP ] && upgrading=1 || :
+
 case "$1" in
     configure)
       # Initially set destination files owenership (only on the first install)
-      [ -f $ST2_UPGRADESTAMP ] && upgrading=1 && rm $ST2_UPGRADESTAMP || :
-      [ "$upgrading" = 0 ] && set_permissions "$DEST_PERMS" || :
+      [ "$upgrading" = 1 ] || set_permissions "$SET_PERMS"
+      rm -f $ST2_UPGRADESTAMP
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;

From 6db66e300b98c774580d8f6e1d949348bec49f13 Mon Sep 17 00:00:00 2001
From: Kirill Izotov <enykeev@stackstorm.com>
Date: Thu, 27 Oct 2016 16:16:54 +0700
Subject: [PATCH 19/42] Create config folder

Cherry-picked from StackStorm/st2-packages@1a16e3dfa154bfa15b91cbb409d05a2e6e5d1c15
---
 packages/st2/debian/postinst         | 1 +
 packages/st2/debian/preinst          | 1 +
 packages/st2/rpm/preinst_script.spec | 1 +
 3 files changed, 3 insertions(+)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index 7e02e7d1dc..c27f004ba2 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -26,6 +26,7 @@ upgrading=0
 SET_PERMS=$(cat <<EHD | sed 's/\s\+/ /g'
 -R ug+rw root:_packsgroup /opt/stackstorm/packs
    ug+rw root:_packsgroup /opt/stackstorm/virtualenvs
+   755 _st2user:root      /opt/stackstorm/configs
    755 _st2user:root      /opt/stackstorm/exports
    755 _st2user:root      /var/log/st2
    755 _st2user:root      /var/run/st2
diff --git a/packages/st2/debian/preinst b/packages/st2/debian/preinst
index bcec1431ec..6ef54ddda7 100644
--- a/packages/st2/debian/preinst
+++ b/packages/st2/debian/preinst
@@ -23,6 +23,7 @@ ST2_UPGRADESTAMP="/tmp/.stamp-stackstorm-st2-deb-package"
 RESET_PERMS=$(cat <<EHD | sed 's/\s\+/ /g'
 ug+rw root:_packsgroup /opt/stackstorm/packs
 ug+rw root:_packsgroup /opt/stackstorm/virtualenvs
+755 _st2user:root      /opt/stackstorm/configs
 755 _st2user:root      /opt/stackstorm/exports
 EHD
 )
diff --git a/packages/st2/rpm/preinst_script.spec b/packages/st2/rpm/preinst_script.spec
index ec03376cac..fbf9a153ea 100644
--- a/packages/st2/rpm/preinst_script.spec
+++ b/packages/st2/rpm/preinst_script.spec
@@ -8,6 +8,7 @@ ST2_USER=%{svc_user}
 RESET_PERMS=$(cat <<EHD | sed 's/\s\+/ /g'
 ug+rw root:_packsgroup /opt/stackstorm/packs
 ug+rw root:_packsgroup /opt/stackstorm/virtualenvs
+755 _st2user:root      /opt/stackstorm/configs
 755 _st2user:root      /opt/stackstorm/exports
 EHD
 )

From 4e0e1ad7dec181e6b59d71c0d6f8619dd79fe46e Mon Sep 17 00:00:00 2001
From: armab <dev@arma.biz>
Date: Mon, 7 Nov 2016 13:35:40 +0200
Subject: [PATCH 20/42] Fix user's group creation for rpm

Fixes StackStorm/st2-packages#361

Cherry-picked from StackStorm/st2-packages@0dce5162a8e048c52570123d7ee9349d5a865073
---
 packages/st2/rpm/preinst_script.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/st2/rpm/preinst_script.spec b/packages/st2/rpm/preinst_script.spec
index fbf9a153ea..c87c22de00 100644
--- a/packages/st2/rpm/preinst_script.spec
+++ b/packages/st2/rpm/preinst_script.spec
@@ -17,7 +17,7 @@ EHD
 create_users() {
   # create st2 user (services user)
   (id $ST2_USER 1>/dev/null 2>&1) ||
-    adduser --no-create-home --system $ST2_USER
+    adduser --no-create-home --system --user-group $ST2_USER
 
   # make st2 member of st2packs group
   (getent group $PACKS_GROUP 1>/dev/null 2>&1) || groupadd -r $PACKS_GROUP

From a3da9535110732f9b489712a93e9805b0de4cb71 Mon Sep 17 00:00:00 2001
From: bigmstone <matthew99@gmail.com>
Date: Mon, 21 Nov 2016 15:10:50 -0600
Subject: [PATCH 21/42] Adding postinst register runners.

Cherry-picked from StackStorm/st2-packages@e0c2f8a5facfbb32819c8403c8b782b8b446a82c
---
 packages/st2/debian/postinst          | 6 ++++++
 packages/st2/rpm/postinst_script.spec | 7 +++++++
 2 files changed, 13 insertions(+)
 create mode 100644 packages/st2/rpm/postinst_script.spec

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index c27f004ba2..0696258e82 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -44,6 +44,10 @@ set_permissions() {
   echo "$fileperms" | cut -f1,2,4 -d' ' | xargs -L1 chmod
 }
 
+register_runners() {
+    st2ctl reload --register-runners
+}
+
 # Choose first install or upgrade
 [ -f $ST2_UPGRADESTAMP ] && upgrading=1 || :
 
@@ -62,6 +66,8 @@ case "$1" in
     ;;
 esac
 
+[ "$upgrading" = 1] && register_runners
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 
diff --git a/packages/st2/rpm/postinst_script.spec b/packages/st2/rpm/postinst_script.spec
new file mode 100644
index 0000000000..98c10dc340
--- /dev/null
+++ b/packages/st2/rpm/postinst_script.spec
@@ -0,0 +1,7 @@
+register_runners() {
+  st2ctl reload --register-runners
+}
+
+if [ "$1" -ge 1 ]; then
+  register_runners
+fi

From 7c93c993e97363d7f8445ad6cb9ab8d0bc339f3b Mon Sep 17 00:00:00 2001
From: bigmstone <matthew99@gmail.com>
Date: Tue, 22 Nov 2016 17:18:29 -0600
Subject: [PATCH 22/42] Fixing postinst

Cherry-picked from StackStorm/st2-packages@e6187587621f6eb116c381917987c8a31bcd7912
---
 packages/st2/debian/postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index 0696258e82..d25b949d26 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -66,7 +66,7 @@ case "$1" in
     ;;
 esac
 
-[ "$upgrading" = 1] && register_runners
+[ "$upgrading" = 1] && register_runners || :
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.

From 662a5eb2344f761db99e3824501c216c838a93bc Mon Sep 17 00:00:00 2001
From: bigmstone <matthew99@gmail.com>
Date: Tue, 22 Nov 2016 22:41:50 -0600
Subject: [PATCH 23/42] Adding fail-on-failure

Cherry-picked from StackStorm/st2-packages@21da2d8e5d60c8f885eef7ea43674dcb810e460d
---
 packages/st2/debian/postinst          | 2 +-
 packages/st2/rpm/postinst_script.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index d25b949d26..1488778019 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -45,7 +45,7 @@ set_permissions() {
 }
 
 register_runners() {
-    st2ctl reload --register-runners
+    st2ctl reload --register-runners --register-fail-on-failure
 }
 
 # Choose first install or upgrade
diff --git a/packages/st2/rpm/postinst_script.spec b/packages/st2/rpm/postinst_script.spec
index 98c10dc340..3fc9bdb552 100644
--- a/packages/st2/rpm/postinst_script.spec
+++ b/packages/st2/rpm/postinst_script.spec
@@ -1,5 +1,5 @@
 register_runners() {
-  st2ctl reload --register-runners
+  st2ctl reload --register-runners --register-fail-on-failure
 }
 
 if [ "$1" -ge 1 ]; then

From c3ea1cc02f5354618c2b8342f738ad67e6b68510 Mon Sep 17 00:00:00 2001
From: bigmstone <matthew99@gmail.com>
Date: Sun, 4 Dec 2016 20:14:49 -0600
Subject: [PATCH 24/42] Fixing permissions for examples.

Cherry-picked from StackStorm/st2-packages@c86c3c631940ad29a3dbb41399bb5ee99c25d290
---
 packages/st2/debian/postinst         | 1 +
 packages/st2/debian/preinst          | 1 +
 packages/st2/rpm/preinst_script.spec | 1 +
 3 files changed, 3 insertions(+)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index 1488778019..a473c6c239 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -25,6 +25,7 @@ upgrading=0
 ## Permissions of files which should be set on install
 SET_PERMS=$(cat <<EHD | sed 's/\s\+/ /g'
 -R ug+rw root:_packsgroup /opt/stackstorm/packs
+   ug+rw root:_packsgroup /usr/share/doc/st2/examples
    ug+rw root:_packsgroup /opt/stackstorm/virtualenvs
    755 _st2user:root      /opt/stackstorm/configs
    755 _st2user:root      /opt/stackstorm/exports
diff --git a/packages/st2/debian/preinst b/packages/st2/debian/preinst
index 6ef54ddda7..dedecc3740 100644
--- a/packages/st2/debian/preinst
+++ b/packages/st2/debian/preinst
@@ -22,6 +22,7 @@ ST2_UPGRADESTAMP="/tmp/.stamp-stackstorm-st2-deb-package"
 ## Permissions of directories which has to be reset on upgrade
 RESET_PERMS=$(cat <<EHD | sed 's/\s\+/ /g'
 ug+rw root:_packsgroup /opt/stackstorm/packs
+ug+rw root:_packsgroup /usr/share/doc/st2/examples
 ug+rw root:_packsgroup /opt/stackstorm/virtualenvs
 755 _st2user:root      /opt/stackstorm/configs
 755 _st2user:root      /opt/stackstorm/exports
diff --git a/packages/st2/rpm/preinst_script.spec b/packages/st2/rpm/preinst_script.spec
index c87c22de00..7a29830c75 100644
--- a/packages/st2/rpm/preinst_script.spec
+++ b/packages/st2/rpm/preinst_script.spec
@@ -7,6 +7,7 @@ ST2_USER=%{svc_user}
 ## Permissions of directories which has to be reset on upgrade
 RESET_PERMS=$(cat <<EHD | sed 's/\s\+/ /g'
 ug+rw root:_packsgroup /opt/stackstorm/packs
+ug+rw root:_packsgroup /usr/share/doc/st2/examples
 ug+rw root:_packsgroup /opt/stackstorm/virtualenvs
 755 _st2user:root      /opt/stackstorm/configs
 755 _st2user:root      /opt/stackstorm/exports

From 8d57e703c6882a64befcff9fdc70db09912245c4 Mon Sep 17 00:00:00 2001
From: bigmstone <matthew99@gmail.com>
Date: Sun, 4 Dec 2016 20:20:47 -0600
Subject: [PATCH 25/42] Adding recursive for debian postinst.

Cherry-picked from StackStorm/st2-packages@0fccf17680323d89fc96af6ca47b32ee7da48923
---
 packages/st2/debian/postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index a473c6c239..3c18218013 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -25,7 +25,7 @@ upgrading=0
 ## Permissions of files which should be set on install
 SET_PERMS=$(cat <<EHD | sed 's/\s\+/ /g'
 -R ug+rw root:_packsgroup /opt/stackstorm/packs
-   ug+rw root:_packsgroup /usr/share/doc/st2/examples
+-R ug+rw root:_packsgroup /usr/share/doc/st2/examples
    ug+rw root:_packsgroup /opt/stackstorm/virtualenvs
    755 _st2user:root      /opt/stackstorm/configs
    755 _st2user:root      /opt/stackstorm/exports

From 5536f8d373f9c9fe5755c73d3b3b10b6fc9852c6 Mon Sep 17 00:00:00 2001
From: Lakshmi Kannan <lakshmi+github@lakshmikannan.me>
Date: Mon, 5 Dec 2016 19:02:31 -0800
Subject: [PATCH 26/42] Add a space before ]. bash syntax fix

Cherry-picked from StackStorm/st2-packages@dae36a9bff5ef728be7d5e34f109bf7a04d172a3
---
 packages/st2/debian/postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index 3c18218013..6f255d4ab7 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -67,7 +67,7 @@ case "$1" in
     ;;
 esac
 
-[ "$upgrading" = 1] && register_runners || :
+[ "$upgrading" = 1 ] && register_runners || :
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.

From c1cb03f9050f187d7d6a8bc0ddf552bb1c7a5fb4 Mon Sep 17 00:00:00 2001
From: Lakshmi Kannan <lakshmi+github@lakshmikannan.me>
Date: Mon, 5 Dec 2016 19:26:21 -0800
Subject: [PATCH 27/42] Right bash finally

Cherry-picked from StackStorm/st2-packages@606e1d284cbcc9987f751f65bf1e17745f8a6baf
---
 packages/st2/debian/postinst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index 6f255d4ab7..1f62f4be54 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -46,6 +46,7 @@ set_permissions() {
 }
 
 register_runners() {
+    echo "Registering st2 runners on upgrade."
     st2ctl reload --register-runners --register-fail-on-failure
 }
 
@@ -67,7 +68,7 @@ case "$1" in
     ;;
 esac
 
-[ "$upgrading" = 1 ] && register_runners || :
+[ "$upgrading" == 1 ] && register_runners
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.

From a7140d89e73006c651610151ba83eaaf2789f4bf Mon Sep 17 00:00:00 2001
From: Lakshmi Kannan <lakshmi+github@lakshmikannan.me>
Date: Tue, 6 Dec 2016 11:43:45 -0800
Subject: [PATCH 28/42] sh likes -eq more than ==

Cherry-picked from StackStorm/st2-packages@a2976ceb33569815d80b67832ed3766019215c9f
---
 packages/st2/debian/postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index 1f62f4be54..8d10361c89 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -68,7 +68,7 @@ case "$1" in
     ;;
 esac
 
-[ "$upgrading" == 1 ] && register_runners
+[ "$upgrading" -eq 1 ] && register_runners
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.

From e37d82fb07785737ef3e3e398905cbd33092987e Mon Sep 17 00:00:00 2001
From: bigmstone <matthew99@gmail.com>
Date: Wed, 27 Jun 2018 18:23:47 -0500
Subject: [PATCH 29/42] Adding orchestra runner to requirements.

Cherry-picked from StackStorm/st2-packages@b66303e1f20928a964f090e7886a75785f31d6c5
---
 packages/st2/debian/postinst          | 7 ++++++-
 packages/st2/rpm/postinst_script.spec | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index 8d10361c89..23b2e7b7b4 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -50,6 +50,11 @@ register_runners() {
     st2ctl reload --register-runners --register-fail-on-failure
 }
 
+install_orchestra_runner() {
+    echo "Installing orchestra runner"
+    (cd /opt/stackstorm/runners/orchestra_runner; /opt/stackstorm/virtualenv/python setup.py install)
+}
+
 # Choose first install or upgrade
 [ -f $ST2_UPGRADESTAMP ] && upgrading=1 || :
 
@@ -68,7 +73,7 @@ case "$1" in
     ;;
 esac
 
-[ "$upgrading" -eq 1 ] && register_runners
+[ "$upgrading" -eq 1 ] && install_orchestra_runner && register_runners
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
diff --git a/packages/st2/rpm/postinst_script.spec b/packages/st2/rpm/postinst_script.spec
index 3fc9bdb552..a4ce951e31 100644
--- a/packages/st2/rpm/postinst_script.spec
+++ b/packages/st2/rpm/postinst_script.spec
@@ -2,6 +2,12 @@ register_runners() {
   st2ctl reload --register-runners --register-fail-on-failure
 }
 
+install_orchestra_runner() {
+    echo "Installing orchestra runner"
+    (cd /opt/stackstorm/runners/orchestra_runner; /opt/stackstorm/virtualenv/python setup.py install)
+}
+
 if [ "$1" -ge 1 ]; then
+  install_orchestra_runner
   register_runners
 fi

From 54a4f08fe92cf1d5c197e61c7e521841289f4443 Mon Sep 17 00:00:00 2001
From: Kirill Enykeev <enykeev@mech.sh>
Date: Thu, 28 Jun 2018 11:50:09 +0700
Subject: [PATCH 30/42] Revert "Adding orchestra runner to requirements"

Cherry-picked from StackStorm/st2-packages@7abda87a48cf9c1a360eac82e954e2291313817e
---
 packages/st2/debian/postinst          | 7 +------
 packages/st2/rpm/postinst_script.spec | 6 ------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index 23b2e7b7b4..8d10361c89 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -50,11 +50,6 @@ register_runners() {
     st2ctl reload --register-runners --register-fail-on-failure
 }
 
-install_orchestra_runner() {
-    echo "Installing orchestra runner"
-    (cd /opt/stackstorm/runners/orchestra_runner; /opt/stackstorm/virtualenv/python setup.py install)
-}
-
 # Choose first install or upgrade
 [ -f $ST2_UPGRADESTAMP ] && upgrading=1 || :
 
@@ -73,7 +68,7 @@ case "$1" in
     ;;
 esac
 
-[ "$upgrading" -eq 1 ] && install_orchestra_runner && register_runners
+[ "$upgrading" -eq 1 ] && register_runners
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
diff --git a/packages/st2/rpm/postinst_script.spec b/packages/st2/rpm/postinst_script.spec
index a4ce951e31..3fc9bdb552 100644
--- a/packages/st2/rpm/postinst_script.spec
+++ b/packages/st2/rpm/postinst_script.spec
@@ -2,12 +2,6 @@ register_runners() {
   st2ctl reload --register-runners --register-fail-on-failure
 }
 
-install_orchestra_runner() {
-    echo "Installing orchestra runner"
-    (cd /opt/stackstorm/runners/orchestra_runner; /opt/stackstorm/virtualenv/python setup.py install)
-}
-
 if [ "$1" -ge 1 ]; then
-  install_orchestra_runner
   register_runners
 fi

From e7e35dbaa696211ad7ebbb9b6fd87d729c6c75d7 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Thu, 27 Sep 2018 15:45:10 +0200
Subject: [PATCH 31/42] register_runners post install step is not needed
 anymore.

Cherry-picked from StackStorm/st2-packages@d02f9dec9e4d6fd0c5e481a7d36c194523e58938
---
 packages/st2/debian/postinst          | 7 -------
 packages/st2/rpm/postinst_script.spec | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index 8d10361c89..85c3a129a3 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -45,11 +45,6 @@ set_permissions() {
   echo "$fileperms" | cut -f1,2,4 -d' ' | xargs -L1 chmod
 }
 
-register_runners() {
-    echo "Registering st2 runners on upgrade."
-    st2ctl reload --register-runners --register-fail-on-failure
-}
-
 # Choose first install or upgrade
 [ -f $ST2_UPGRADESTAMP ] && upgrading=1 || :
 
@@ -68,8 +63,6 @@ case "$1" in
     ;;
 esac
 
-[ "$upgrading" -eq 1 ] && register_runners
-
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 
diff --git a/packages/st2/rpm/postinst_script.spec b/packages/st2/rpm/postinst_script.spec
index 3fc9bdb552..e69de29bb2 100644
--- a/packages/st2/rpm/postinst_script.spec
+++ b/packages/st2/rpm/postinst_script.spec
@@ -1,7 +0,0 @@
-register_runners() {
-  st2ctl reload --register-runners --register-fail-on-failure
-}
-
-if [ "$1" -ge 1 ]; then
-  register_runners
-fi

From a4c974af219e235fcd3b86eeaa130ae27c46ab08 Mon Sep 17 00:00:00 2001
From: Igor Fernandes <igor.fernandes@corp.globo.com>
Date: Tue, 14 May 2019 15:12:36 -0300
Subject: [PATCH 32/42] Only call set_permissions at upgrade action

Cherry-picked from StackStorm/st2-packages@f91c3001c0e95b197f4057407ef9e6a5453d5782
---
 packages/st2/rpm/preinst_script.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/st2/rpm/preinst_script.spec b/packages/st2/rpm/preinst_script.spec
index 7a29830c75..3d93b13120 100644
--- a/packages/st2/rpm/preinst_script.spec
+++ b/packages/st2/rpm/preinst_script.spec
@@ -54,6 +54,6 @@ set_permissions() {
 create_users
 
 # We perform upgrade (when install count > 1)
-if [ "$1" -ge 1 ]; then
+if [ "$1" -gt 1 ]; then
   set_permissions "$RESET_PERMS"
 fi

From ba880357c5ec9852eacb53e57a4c4c40604424d0 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Sat, 8 Feb 2020 23:54:22 +0100
Subject: [PATCH 33/42] Upgrade "postrm purge" script invocation and make sure
 it deletes all the StackStorm related configs and files.

Cherry-picked from StackStorm/st2-packages@7bb9bd5bca4ba86b98e941b4443be3c667071ed4
---
 packages/st2/debian/postrm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/st2/debian/postrm b/packages/st2/debian/postrm
index cf9b760e24..d966dc55cf 100644
--- a/packages/st2/debian/postrm
+++ b/packages/st2/debian/postrm
@@ -24,6 +24,12 @@ preserve_logrotate() {
     [ -f /etc/logrotate.d/st2 ] && mv /etc/logrotate.d/st2-pkgsaved.disabled 1>/dev/null 2>&1 || :
   elif [ "$1" = purge ]; then
     rm -f /etc/logrotate.d/st2-pkgsaved.disabled 1>/dev/null 2>&1 || :
+    # Clean up other StackStorm related configs and directories
+    rm -rf /etc/st2 1>/dev/null 2>&1 || :
+    rm -rf /opt/stackstorm 1>/dev/null 2>&1 || :
+    rm -rf /root/.st2 1>/dev/null 2>&1 || :
+    rm -rf /var/log/st2 1>/dev/null 2>&1 || :
+    rm -f /etc/sudoers.d/st2 1>/dev/null 2>&1 || :
   fi
 }
 

From e908f9ce624fa8464fe14fc9cecb509ef95044d0 Mon Sep 17 00:00:00 2001
From: Carlos <nzlosh@yahoo.com>
Date: Fri, 1 Oct 2021 15:54:54 +0200
Subject: [PATCH 34/42] Perform a systemd daemon-reload after package
 installation to ensure generators are run for socket files.

Cherry-picked from StackStorm/st2-packages@782259625c089ca0c875719c83cfa05b85fe7e2f
---
 packages/st2/debian/postinst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index 85c3a129a3..2e7c0e4498 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -53,6 +53,7 @@ case "$1" in
       # Initially set destination files owenership (only on the first install)
       [ "$upgrading" = 1 ] || set_permissions "$SET_PERMS"
       rm -f $ST2_UPGRADESTAMP
+      systemctl daemon-reload
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;

From 0cd21f9c03d4268313caa3c43fbba1b25795d77b Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Sat, 2 Oct 2021 22:50:21 -0500
Subject: [PATCH 35/42] move daemon-reload to postinst_script.spec

Cherry-picked from StackStorm/st2-packages@3df52d09c81601ede4a312d9900b14754beb39fa
---
 packages/st2/rpm/postinst_script.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/st2/rpm/postinst_script.spec b/packages/st2/rpm/postinst_script.spec
index e69de29bb2..8c371419bf 100644
--- a/packages/st2/rpm/postinst_script.spec
+++ b/packages/st2/rpm/postinst_script.spec
@@ -0,0 +1,4 @@
+set -ex
+
+# make sure that our socket generators run
+systemctl daemon-reload

From 35fd98c3061104c8bf01ee5968a29782dd3246f8 Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Wed, 6 Oct 2021 18:39:07 -0500
Subject: [PATCH 36/42] add comment about purpose of systemctl daemon-reload

Cherry-picked from StackStorm/st2-packages@942511658738d00d6d594cb91bd95710e67075c6
---
 packages/st2/debian/postinst          | 2 ++
 packages/st2/rpm/postinst_script.spec | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index 2e7c0e4498..bedcda5f5d 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -53,6 +53,8 @@ case "$1" in
       # Initially set destination files owenership (only on the first install)
       [ "$upgrading" = 1 ] || set_permissions "$SET_PERMS"
       rm -f $ST2_UPGRADESTAMP
+
+      # make sure that our socket generators run
       systemctl daemon-reload
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/packages/st2/rpm/postinst_script.spec b/packages/st2/rpm/postinst_script.spec
index 8c371419bf..09f7143fac 100644
--- a/packages/st2/rpm/postinst_script.spec
+++ b/packages/st2/rpm/postinst_script.spec
@@ -1,4 +1,4 @@
-set -ex
+set -e
 
 # make sure that our socket generators run
 systemctl daemon-reload

From 15ad8ecd8d8eb74c14b448477bdd5fda03a5935d Mon Sep 17 00:00:00 2001
From: Eugen Cusmaunsa <stackstorm@armab.io>
Date: Mon, 18 Oct 2021 22:12:06 +0100
Subject: [PATCH 37/42] Ignore systemctl deamon-reload failure

Fixes docker build where systemctl is not available during the st2 package installation resulting in a failure.

```
Setting up st2 (3.6dev-47) ...
System has not been booted with systemd as init system (PID 1). Can't operate.
dpkg: error processing package st2 (--configure):
 installed st2 package post-installation script subprocess returned error exit status 1
```

Cherry-picked from StackStorm/st2-packages@e6903ed8071df1fa5c81dbd3be839f0f269dee30
---
 packages/st2/debian/postinst          | 2 +-
 packages/st2/rpm/postinst_script.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/st2/debian/postinst b/packages/st2/debian/postinst
index bedcda5f5d..510b49fbfe 100644
--- a/packages/st2/debian/postinst
+++ b/packages/st2/debian/postinst
@@ -55,7 +55,7 @@ case "$1" in
       rm -f $ST2_UPGRADESTAMP
 
       # make sure that our socket generators run
-      systemctl daemon-reload
+      systemctl daemon-reload >/dev/null 2>&1 || true
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;
diff --git a/packages/st2/rpm/postinst_script.spec b/packages/st2/rpm/postinst_script.spec
index 09f7143fac..65f63cf599 100644
--- a/packages/st2/rpm/postinst_script.spec
+++ b/packages/st2/rpm/postinst_script.spec
@@ -1,4 +1,4 @@
 set -e
 
 # make sure that our socket generators run
-systemctl daemon-reload
+systemctl daemon-reload >/dev/null 2>&1 || true

From c1b76700cb69037a87244f40e6779c5b9bcdaa86 Mon Sep 17 00:00:00 2001
From: amanda <amanda.mcguinness@ammeonsolutions.com>
Date: Fri, 18 Feb 2022 11:56:57 +0000
Subject: [PATCH 38/42] Add overrides directory for pack overriding of meta
 data

Cherry-picked from StackStorm/st2-packages@78d55d05b0835d332bc77763d105c27c5e46a979
---
 packages/st2/debian/preinst          | 1 +
 packages/st2/rpm/preinst_script.spec | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/st2/debian/preinst b/packages/st2/debian/preinst
index dedecc3740..daf0adc88d 100644
--- a/packages/st2/debian/preinst
+++ b/packages/st2/debian/preinst
@@ -25,6 +25,7 @@ ug+rw root:_packsgroup /opt/stackstorm/packs
 ug+rw root:_packsgroup /usr/share/doc/st2/examples
 ug+rw root:_packsgroup /opt/stackstorm/virtualenvs
 755 _st2user:root      /opt/stackstorm/configs
+755 _st2user:root      /opt/stackstorm/overrides
 755 _st2user:root      /opt/stackstorm/exports
 EHD
 )
diff --git a/packages/st2/rpm/preinst_script.spec b/packages/st2/rpm/preinst_script.spec
index 3d93b13120..f606a1900a 100644
--- a/packages/st2/rpm/preinst_script.spec
+++ b/packages/st2/rpm/preinst_script.spec
@@ -11,6 +11,7 @@ ug+rw root:_packsgroup /usr/share/doc/st2/examples
 ug+rw root:_packsgroup /opt/stackstorm/virtualenvs
 755 _st2user:root      /opt/stackstorm/configs
 755 _st2user:root      /opt/stackstorm/exports
+755 _st2user:root      /opt/stackstorm/overrides
 EHD
 )
 

From bbdd9f0c962f81cfe8ee36a97b51b67ad6743822 Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Thu, 6 Mar 2025 16:50:14 -0600
Subject: [PATCH 39/42] pants: move scriptlets copied from st2-packages.git

---
 .../st2/debian/postinst => packaging/deb/scripts/post-install.sh  | 0
 .../st2/debian/postrm => packaging/deb/scripts/post-remove.sh     | 0
 .../st2/debian/preinst => packaging/deb/scripts/pre-install.sh    | 0
 .../postinst_script.spec => packaging/rpm/scripts/post-install.sh | 0
 .../preinst_script.spec => packaging/rpm/scripts/pre-install.sh   | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename packages/st2/debian/postinst => packaging/deb/scripts/post-install.sh (100%)
 rename packages/st2/debian/postrm => packaging/deb/scripts/post-remove.sh (100%)
 rename packages/st2/debian/preinst => packaging/deb/scripts/pre-install.sh (100%)
 rename packages/st2/rpm/postinst_script.spec => packaging/rpm/scripts/post-install.sh (100%)
 rename packages/st2/rpm/preinst_script.spec => packaging/rpm/scripts/pre-install.sh (100%)

diff --git a/packages/st2/debian/postinst b/packaging/deb/scripts/post-install.sh
similarity index 100%
rename from packages/st2/debian/postinst
rename to packaging/deb/scripts/post-install.sh
diff --git a/packages/st2/debian/postrm b/packaging/deb/scripts/post-remove.sh
similarity index 100%
rename from packages/st2/debian/postrm
rename to packaging/deb/scripts/post-remove.sh
diff --git a/packages/st2/debian/preinst b/packaging/deb/scripts/pre-install.sh
similarity index 100%
rename from packages/st2/debian/preinst
rename to packaging/deb/scripts/pre-install.sh
diff --git a/packages/st2/rpm/postinst_script.spec b/packaging/rpm/scripts/post-install.sh
similarity index 100%
rename from packages/st2/rpm/postinst_script.spec
rename to packaging/rpm/scripts/post-install.sh
diff --git a/packages/st2/rpm/preinst_script.spec b/packaging/rpm/scripts/pre-install.sh
similarity index 100%
rename from packages/st2/rpm/preinst_script.spec
rename to packaging/rpm/scripts/pre-install.sh

From b2fd1b63666d356f40192033c99226b0a14f4b34 Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Thu, 6 Mar 2025 16:51:54 -0600
Subject: [PATCH 40/42] update changelog entry

---
 CHANGELOG.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index aa78a80b33..fca4143b62 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -111,7 +111,7 @@ Added
 * Add python 3.10 and 3.11 to the GitHub Actions test matrix.
   Contributed by @nzlosh, @guzzijones12, and @cognifloyd
 
-* Copy systemd files from st2-packages.git for future packaging via pants. #6303
+* Copy systemd files and rpm/deb scriptlets from st2-packages.git for future packaging via pants. #6303 #6313
   Cherry-picked by @cognifloyd
 
 * Cherry-pick changes to runners.sh from st2-packages git repo. #6302

From 0d6352b278ae6503a79b276918db76755dc60d32 Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Thu, 6 Mar 2025 16:54:00 -0600
Subject: [PATCH 41/42] pants tailor ::

---
 packaging/deb/scripts/BUILD | 1 +
 packaging/rpm/scripts/BUILD | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 packaging/deb/scripts/BUILD
 create mode 100644 packaging/rpm/scripts/BUILD

diff --git a/packaging/deb/scripts/BUILD b/packaging/deb/scripts/BUILD
new file mode 100644
index 0000000000..6c95f66377
--- /dev/null
+++ b/packaging/deb/scripts/BUILD
@@ -0,0 +1 @@
+shell_sources()
diff --git a/packaging/rpm/scripts/BUILD b/packaging/rpm/scripts/BUILD
new file mode 100644
index 0000000000..6c95f66377
--- /dev/null
+++ b/packaging/rpm/scripts/BUILD
@@ -0,0 +1 @@
+shell_sources()

From 83394be920b4e2bb925b4f81b913bd3cf4e1834e Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Thu, 6 Mar 2025 16:58:30 -0600
Subject: [PATCH 42/42] pants: temporarily skip shellcheck on
 packaging/*/scripts

These scripts will be heavliy refactored in a follow-up PR.
That refactor will also fix the shellcheck issues.
---
 packaging/deb/scripts/BUILD | 2 +-
 packaging/rpm/scripts/BUILD | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/deb/scripts/BUILD b/packaging/deb/scripts/BUILD
index 6c95f66377..31c2d6bc4c 100644
--- a/packaging/deb/scripts/BUILD
+++ b/packaging/deb/scripts/BUILD
@@ -1 +1 @@
-shell_sources()
+shell_sources(skip_shellcheck=True)
diff --git a/packaging/rpm/scripts/BUILD b/packaging/rpm/scripts/BUILD
index 6c95f66377..31c2d6bc4c 100644
--- a/packaging/rpm/scripts/BUILD
+++ b/packaging/rpm/scripts/BUILD
@@ -1 +1 @@
-shell_sources()
+shell_sources(skip_shellcheck=True)