Rework pre- and post-install hooks, move chown into package function

3 files changed, 7 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b25e61b84c4c..338bc74e053f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,7 +14,7 @@ pkgbase = traefik-bin
 	source = traefik.service
 	source = traefik.toml
 	source = https://raw.githubusercontent.com/containous/traefik/v1.1.2/LICENSE.md
-	sha512sums = 24f2b89ea13f630684f2628e4e36d51917bd10013a8250ecb63d9931626b7406bc158e97a0f14b0a7b89448eb398d57cd271f2d89b6c64a2b285bda71950e0f8
+	sha512sums = de3e4cddedf05bdf182c31f4e1ff7ebe5a5ca425ea0669682054d699f96255f82ff84882fa151681bc7aa22dead48ba520a8a07f2e1d0f19ac840741c1b92f59
 	sha512sums = d1dfacff1e7a5b9f8e8b4796fcfbb9c1bed6151013708078361ac31ae221dd956f746ec1e0bc5bd09a05763438d877318259577f6f0178d42f011bd737c31207
 	sha512sums = 1ba00b19f691e173eb1d69d2a3e1bcb95370025de49baf4f8024c30579cb58c6296ed743959f261b4ada6731f1c810ebe4eb0e3481e7eb17a9f09596fa004986
 	sha512sums = 05de0378cd4c430084c122dfcbb433c9cf8dda912dee03a5c80d1e199b133ecc0b32f6e8ae985544dca89355e21c23c8c4d04c05e1d0a72f5bf135db7fc724d2
diff --git a/PKGBUILD b/PKGBUILD
index 1ab0e6d01f01..0f7163190c89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ source=(
 )
 source_i686=("${_pkgname}_i686_${pkgver}"::"https://github.com/containous/${_pkgname}/releases/download/v${pkgver}/${_pkgname}_linux-386")
 source_x86_64=("${_pkgname}_x86_64_${pkgver}"::"https://github.com/containous/${_pkgname}/releases/download/v${pkgver}/${_pkgname}_linux-amd64")
-sha512sums=('24f2b89ea13f630684f2628e4e36d51917bd10013a8250ecb63d9931626b7406bc158e97a0f14b0a7b89448eb398d57cd271f2d89b6c64a2b285bda71950e0f8'
+sha512sums=('de3e4cddedf05bdf182c31f4e1ff7ebe5a5ca425ea0669682054d699f96255f82ff84882fa151681bc7aa22dead48ba520a8a07f2e1d0f19ac840741c1b92f59'
             'd1dfacff1e7a5b9f8e8b4796fcfbb9c1bed6151013708078361ac31ae221dd956f746ec1e0bc5bd09a05763438d877318259577f6f0178d42f011bd737c31207'
             '1ba00b19f691e173eb1d69d2a3e1bcb95370025de49baf4f8024c30579cb58c6296ed743959f261b4ada6731f1c810ebe4eb0e3481e7eb17a9f09596fa004986'
             '05de0378cd4c430084c122dfcbb433c9cf8dda912dee03a5c80d1e199b133ecc0b32f6e8ae985544dca89355e21c23c8c4d04c05e1d0a72f5bf135db7fc724d2'
@@ -39,4 +39,6 @@ package() {
 
   install -D -m644 "${srcdir}/LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   install -D -m755 "${srcdir}/${_pkgname}_${CARCH}_${pkgver}" "${pkgdir}/usr/bin/${_pkgname}"
+
+  chown traefik:traefik "${pkgdir}/var/log/${_pkgname}"
 }
diff --git a/traefik.install b/traefik.install
index 07c0968d3ff7..fc9563b1c494 100644
--- a/traefik.install
+++ b/traefik.install
@@ -1,12 +1,8 @@
-post_install() {
+pre_install() {
   getent group traefik &> /dev/null || groupadd -r traefik &> /dev/null
   getent passwd traefik &> /dev/null || useradd -s /sbin/nologin -c "Traefik user" -d /var/empty -g traefik -r traefik &> /dev/null
-  chmod u+s usr/bin/traefik &>/dev/null
-  chown traefik:traefik usr/bin/traefik &>/dev/null
-  chown traefik:traefik var/log/traefik &>/dev/null
-  setcap 'cap_net_bind_service=+ep' usr/bin/traefik &>/dev/null
 }
 
-post_upgrade() {
-  post_install
+post_install() {
+  setcap 'cap_net_bind_service=+ep' "usr/bin/traefik"
 }