[arch-commits] Commit in openfire/trunk (4 files)

[Massimiliano Torromeo]

    Date: Thursday, March 8, 2018 @ 11:44:50
  Author: mtorromeo
Revision: 304681

upgpkg: openfire 4.2.2-4

Change service home to /var/lib/openfire with symlinks created by tmpfiles.d

Modified:
  openfire/trunk/PKGBUILD
  openfire/trunk/openfire.service
  openfire/trunk/tmpfile.conf
  openfire/trunk/user.conf

------------------+
 PKGBUILD         |   10 ++++------
 openfire.service |    2 +-
 tmpfile.conf     |   10 +++++++---
 user.conf        |    2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-08 11:39:53 UTC (rev 304680)
+++ PKGBUILD	2018-03-08 11:44:50 UTC (rev 304681)
@@ -4,7 +4,7 @@
 
 pkgname=openfire
 pkgver=4.2.2
-pkgrel=3
+pkgrel=4
 pkgdesc="High performance XMPP (Jabber) server."
 arch=('any')
 url='http://www.igniterealtime.org/projects/openfire/'
@@ -20,9 +20,9 @@
         'tmpfile.conf')
 sha256sums=('a9fa56332cec9437c751644bf23dbbf65a332605493d4780b97b0da4a5febe7d'
             'c8a612abee90bdc9a2869e562a4bbbf596159c60adcd23368833a0e2ca27c1d4'
-            'cc04a614686d3f9ce3b83b5fcfb7c5f4cd5ddb8c4c06830c04f26869f2e8fa5b'
-            '743d07158d40f3690684a078d5f35c53c819e45d4ff0c2016b0f33662363614f'
-            'c9c7269603d96d59b1a50201a950a47441bd7ecd35852d15037f15761c0ad4e3')
+            '3e7bca77161777daefd3533d4d6f42ff7970533c887d6f4b7f1c9fdcf7771d05'
+            '8bfa51cf8cc88fc69547a8f6e9e3fb242926ca2a100659363e1a6b332f223ba9'
+            'd50dea06f165284fb2c2a7497324da767cad0e97cddcb125b9495850dea5f203')
 
 build() {
 	cd "$srcdir"/openfire_src/build
@@ -45,8 +45,6 @@
 	rm -rf bin logs lib/tray.dll
 
 	cp -R conf/* "$pkgdir"/etc/openfire/
-	ln -s /etc/openfire "$pkgdir"/usr/share/openfire/conf
-	ln -s /var/log/openfire "$pkgdir"/usr/share/openfire/logs
 
 	cp -R resources/security "$pkgdir"/etc/openfire/
 	ln -s /etc/openfire/security "$pkgdir"/usr/share/openfire/resources/security

Modified: openfire.service
===================================================================
--- openfire.service	2018-03-08 11:39:53 UTC (rev 304680)
+++ openfire.service	2018-03-08 11:44:50 UTC (rev 304681)
@@ -8,7 +8,7 @@
 Group=openfire
 PrivateTmp=true
 EnvironmentFile=/etc/conf.d/openfire
-ExecStart=/usr/bin/java -server $OPENFIRE_OPTS -DopenfireHome=/usr/share/openfire -Dopenfire.lib.dir=/usr/lib/openfire -classpath /usr/lib/openfire/startup.jar -jar /usr/lib/openfire/startup.jar
+ExecStart=/usr/bin/java -server $OPENFIRE_OPTS -DopenfireHome=/var/lib/openfire -Dopenfire.lib.dir=/usr/lib/openfire -classpath /usr/lib/openfire/startup.jar -jar /usr/lib/openfire/startup.jar
 SuccessExitStatus=143 SIGKILL
 
 [Install]

Modified: tmpfile.conf
===================================================================
--- tmpfile.conf	2018-03-08 11:39:53 UTC (rev 304680)
+++ tmpfile.conf	2018-03-08 11:44:50 UTC (rev 304681)
@@ -1,4 +1,8 @@
-d /var/log/openfire 0755 openfire openfire -
 z /etc/openfire 0750 openfire openfire -
-z /usr/share/openfire 0755 openfire openfire -
-z /usr/share/openfire/plugins 0755 openfire openfire -
+d /var/log/openfire 0750 openfire openfire -
+d /var/lib/openfire 0750 openfire openfire -
+d /var/lib/openfire/plugins 0750 openfire openfire -
+L /var/lib/openfire/conf - - - - /etc/openfire
+L /var/lib/openfire/logs - - - - /var/log/openfire
+L /var/lib/openfire/plugins/admin - - - - /usr/share/openfire/plugins/admin
+L /var/lib/openfire/resources - - - - /usr/share/openfire/resources

Modified: user.conf
===================================================================
--- user.conf	2018-03-08 11:39:53 UTC (rev 304680)
+++ user.conf	2018-03-08 11:44:50 UTC (rev 304681)
@@ -1 +1 @@
-u openfire - "openfire user" /usr/share/openfire
+u openfire - "openfire user" /var/lib/openfire