Update to 5.2-1

4 files changed, 20 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f325d7b6815b..7d44467bf5b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Wed Dec 30 18:08:41 UTC 2015
 pkgbase = sonarqube
 	pkgdesc = A code quality management platform.
 	pkgver = 5.2
-	pkgrel = 0
+	pkgrel = 1
 	url = http://www.sonarqube.org/
 	install = sonarqube.install
 	arch = i686
@@ -11,6 +13,7 @@ pkgbase = sonarqube
 	optdepends = apache: a full featured webserver
 	optdepends = mariadb: Fast SQL database server, drop-in replacement for MySQL
 	optdepends = maven: a java project management and project comprehension tool
+	optdepends = postgresql: A sophisticated object-relational DBMS
 	provides = sonarqube
 	conflicts = sonarqube-lts
 	replaces = sonarqube
@@ -25,8 +28,8 @@ pkgbase = sonarqube
 	md5sums = 3d0e923a11f3ce5caa272e5ce86a711a
 	md5sums = f9200f1722578c3e3af312c74295db9c
 	md5sums = 0561e8954de393e963b5b9f991a080cb
-	md5sums = 04484a8a3cc5cac4d8fbeddbdea1fbd0
-	md5sums = 2298d28f6be2114fbe1911cf6e5f78fc
+	md5sums = d7450179d89871589e7a377fbd696258
+	md5sums = d2b63c1fd37954bb470a7d9003aed7f4
 
 pkgname = sonarqube
 
diff --git a/PKGBUILD b/PKGBUILD
index cc2667290562..c25926637ec5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=sonarqube
 pkgver=5.2
-pkgrel=0
+pkgrel=1
 pkgdesc="A code quality management platform."
 url="http://www.sonarqube.org/"
 arch=('i686' 'x86_64')
@@ -10,7 +10,8 @@ license=('LGPL3')
 depends=('java-environment-common')
 optdepends=('apache: a full featured webserver'
             'mariadb: Fast SQL database server, drop-in replacement for MySQL'
-            'maven: a java project management and project comprehension tool')
+            'maven: a java project management and project comprehension tool'
+            'postgresql: A sophisticated object-relational DBMS')
 
 backup=('etc/sonarqube/sonar.properties' 
         'etc/sonarqube/wrapper.conf')
@@ -30,8 +31,8 @@ source=(https://sonarsource.bintray.com/Distribution/${pkgname}/${pkgname}-${pkg
 md5sums=('3d0e923a11f3ce5caa272e5ce86a711a'
 	 'f9200f1722578c3e3af312c74295db9c'
 	 '0561e8954de393e963b5b9f991a080cb'
-         '04484a8a3cc5cac4d8fbeddbdea1fbd0'
-         '2298d28f6be2114fbe1911cf6e5f78fc')
+         'd7450179d89871589e7a377fbd696258'
+         'd2b63c1fd37954bb470a7d9003aed7f4')
 
 package() {
   cd ${srcdir}
@@ -63,10 +64,11 @@ package() {
 
   # install the additional config files to the desired destination
   msg "Installing configuration files"
-  mkdir -p ${pkgdir}/etc/${pkgname}
+  mkdir -p ${pkgdir}/etc/${pkgname}/
   install ${srcdir}/${pkgname}-${pkgver}/conf/sonar.properties ${pkgdir}/etc/${pkgname}/sonar.properties
   install ${srcdir}/${pkgname}-${pkgver}/conf/wrapper.conf ${pkgdir}/etc/${pkgname}/wrapper.conf
   rm -r ${srcdir}/${pkgname}-${pkgver}/conf
+  ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
 
   # copy documentation
   msg "Copy documentation"
@@ -76,18 +78,16 @@ package() {
 
   # delete not needed directories
   rm -r ${srcdir}/${pkgname}-${pkgver}/logs
+  mkdir -p ${pkgdir}/var/log/${pkgname}/
+  touch ${pkgdir}/var/log/${pkgname}/wrapper.log
+  touch ${pkgdir}/var/log/${pkgname}/sonar.log
+  touch ${pkgdir}/var/log/${pkgname}/profiling.log
   ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  #mkdir -p /var/log/
 
   # copy the source to the final directory
   msg "Copy Source to final directory"
   cp -a ${srcdir}/${pkgname}-${pkgver}/* ${pkgdir}/usr/share/${pkgname} || return 1
 
-  mkdir -p ${pkgdir}/var/log/${pkgname}/
-  touch ${pkgdir}/var/log/${pkgname}/wrapper.log
-  touch ${pkgdir}/var/log/${pkgname}/sonar.log
-  touch ${pkgdir}/var/log/${pkgname}/profiling.log
-
   install -m755 -d ${pkgdir}/run/${pkgname}
 
   install -Dm644 "${srcdir}/sonarqube.service" "${pkgdir}/usr/lib/systemd/system/sonarqube.service"
diff --git a/sonarqube.install b/sonarqube.install
index 9ee00e4d4ad5..6b1c61703c40 100644
--- a/sonarqube.install
+++ b/sonarqube.install
@@ -17,6 +17,8 @@ post_install() {
 
   cd /usr/share/sonarqube
 
+  ln -s /var/log/sonarqube /usr/share/sonarqube/logs
+
   chown -R sonar:sonar *
   chown -R sonar:sonar /etc/sonarqube
   chown -R sonar:sonar /var/run/sonarqube
diff --git a/sonarqube.service b/sonarqube.service
index e5e1dc22fc10..7da163d99fe1 100644
--- a/sonarqube.service
+++ b/sonarqube.service
@@ -4,6 +4,7 @@ After=network.target
 
 [Service]
 User=sonar
+Grup=sonar
 Type=forking
 StandardOutput=syslog
 StandardError=syslog