[arch-commits] Commit in tomcat8/trunk (3 files)

[Guillaume Alaux]

    Date: Monday, February 9, 2015 @ 22:07:44
  Author: guillaume
Revision: 231198

Fix creation of tmp files by systemd

Modified:
  tomcat8/trunk/PKGBUILD
  tomcat8/trunk/systemd_tmpfiles.d_tomcat8.conf
  tomcat8/trunk/tomcat8.install

---------------------------------+
 PKGBUILD                        |    3 ++-
 systemd_tmpfiles.d_tomcat8.conf |    8 +++++---
 tomcat8.install                 |    3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-09 20:46:58 UTC (rev 231197)
+++ PKGBUILD	2015-02-09 21:07:44 UTC (rev 231198)
@@ -24,7 +24,7 @@
 sha256sums=('49f9097073493accb8f8e0827d8f4ee00d2cc115b9188fc3902deb3696554379'
             'd44056248b7cdd6671fd4de08a9453b3bd1a83980343d249a99b74939d46f4d4'
             '3f69c07659509bd1ae9d94cecbbba7c9072f0ede69e0a69d05b67a66aef9f686'
-            'cd637d5b1a0e816c149c868a72d3d315ea0061efc9e544cadfbc73859dedb847')
+            '0dc1fdb537d3488756755f3fb713a9638597d4c68596f6f94f2707e8363cf5e2')
 
 _gid_log=19
 _gid_tomcat=57
@@ -61,6 +61,7 @@
   install -dm775 "${pkgdir}"/var/lib/${pkgname}
   cp -r webapps "${pkgdir}"/var/lib/${pkgname}
   chown -R ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
+  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
   ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
 
   install -dm1777 "${pkgdir}"/var/tmp

Modified: systemd_tmpfiles.d_tomcat8.conf
===================================================================
--- systemd_tmpfiles.d_tomcat8.conf	2015-02-09 20:46:58 UTC (rev 231197)
+++ systemd_tmpfiles.d_tomcat8.conf	2015-02-09 21:07:44 UTC (rev 231198)
@@ -1,3 +1,5 @@
-d   /var/tmp/tomcat8
-d   /var/tmp/tomcat8/temp   0775    tomcat8  tomcat8
-d   /var/tmp/tomcat8/work   0775    tomcat8  tomcat8
+d  /var/tmp/tomcat8/temp     0775  tomcat8  tomcat8
+d  /var/tmp/tomcat8/work     0775  tomcat8  tomcat8
+d  /var/lib/tomcat8          0775  tomcat8  tomcat8
+d  /var/lib/tomcat8/webapps  0775  tomcat8  tomcat8
+d  /var/log/tomcat8          0775  tomcat8  log

Modified: tomcat8.install
===================================================================
--- tomcat8.install	2015-02-09 20:46:58 UTC (rev 231197)
+++ tomcat8.install	2015-02-09 21:07:44 UTC (rev 231198)
@@ -1,5 +1,6 @@
 post_install() {
     systemd-sysusers tomcat8.conf
+    systemd-tmpfiles --create tomcat8.conf
 
   if [ -f lib/modules/$(uname -r)/kernel/security/capability.ko ]; then
     echo 'It appears that your current kernel has linux security'
@@ -13,6 +14,6 @@
 }
 
 pre_remove() {
-  echo "Leftover files may exist in /var/{lib,tmp,log}/tomcat8"
+  echo "Leftover files may reside in /var/{lib,tmp,log}/tomcat8"
   echo "If you remove them, you may also want to remove user and group 'tomcat8'"
 }