change artifactory packaging

5 files changed, 19 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 460e83f29610..0c373b1a6f48 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,8 +14,8 @@ pkgbase = artifactory-oss
 	source = artifactory.service
 	source = artifactory.default
 	sha256sums = 2de13962ad1e6f4f1537e1fd86b6e70da6afae67a2449bf0cb369d3a84267647
-	sha256sums = a085978124b04a3576f6c670e3dee65b836298cb8bcb756dac6dd03f97954483
-	sha256sums = fa0bb817062ab6aac4c2a5f1e9f93887823a21e3c41e24bc77e9a521355eefc5
+	sha256sums = 8ba1287f4d062f57a5cf9e5426d4affcfcc00ca2680cd603f41c603957a42c20
+	sha256sums = 2b0ec5f2940498bfe72ecae5b66cd5ea5743df71ac0bf766fc7363bebf158883
 
 pkgname = artifactory-oss
 
diff --git a/PKGBUILD b/PKGBUILD
index 8b033367e2c1..e4d69759a9b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,8 @@ source=("jfrog-artifactory-oss-${pkgver}.zip::https://bintray.com/jfrog/artifact
         'artifactory.service'
         'artifactory.default')
 sha256sums=('2de13962ad1e6f4f1537e1fd86b6e70da6afae67a2449bf0cb369d3a84267647'
-            'a085978124b04a3576f6c670e3dee65b836298cb8bcb756dac6dd03f97954483'
-            'fa0bb817062ab6aac4c2a5f1e9f93887823a21e3c41e24bc77e9a521355eefc5')
+            '8ba1287f4d062f57a5cf9e5426d4affcfcc00ca2680cd603f41c603957a42c20'
+            '2b0ec5f2940498bfe72ecae5b66cd5ea5743df71ac0bf766fc7363bebf158883')
 options=('!strip')
 PKGEXT='.pkg.tar'
 
@@ -33,5 +33,5 @@ package() {
   cp -r "$pkgname-$pkgver"/* "$pkgdir$artDist"
   install -Dm755 "$srcdir/artifactory.default" "$pkgdir$artDist/bin"
   install -Dm755 "$srcdir/artifactory.service" "$pkgdir/usr/lib/systemd/system/artifactory.service"
-  install -d "$pkgdir/run/artifactory"
+  install -d "$pkgdir/opt/artifactory/run"
 }
diff --git a/artifactory-oss.install b/artifactory-oss.install
index 201b42100acc..7f268c9abdcc 100644
--- a/artifactory-oss.install
+++ b/artifactory-oss.install
@@ -2,8 +2,7 @@ post_install() {
   echo "Creating user and group artifactory..."
   getent group artifactory &>/dev/null || groupadd -r artifactory >/dev/null
   getent passwd artifactory &>/dev/null || useradd -r -g artifactory -d /opt/artifactory artifactory >/dev/null
-  chown -R artifactory /opt/artifactory/etc /opt/artifactory/tomcat/webapps /opt/artifactory/logs
-  chown artifactory /opt/artifactory /opt/artifactory/tomcat /run/artifactory
+  chown -R artifactory /opt/artifactory
 
   echo
   echo 'For the Artifactory user guide and installation instructions please visit:'
@@ -14,6 +13,11 @@ post_install() {
   echo '  username: admin'
   echo '  password: password'
   echo
+  echo 'The default port is 8081'
+  echo
+  echo 'Please make sure to create softlinks from /opt/artifactory/{backup,data,support}'
+  echo 'to appropriate places, since by default Artifactory will write its data to /opt/artifactory'
+  echo
 }
 
 post_upgrade() {
@@ -26,6 +30,11 @@ post_upgrade() {
     echo "Removing Artifactory's exploded WAR directory"
     rm -rf /opt/artifactory/tomcat/webapps/artifactory
   fi
+
+  if [ -f /opt/artifactory/run/artifactory.pid ]; then
+    echo "Removing Artifactory's PID file"
+    rm -f /opt/artifactory/run/artifactory.pid
+  fi
 }
 
 post_remove() {
diff --git a/artifactory.default b/artifactory.default
index 1f1e8f02d07c..ee2102e36622 100755
--- a/artifactory.default
+++ b/artifactory.default
@@ -6,7 +6,7 @@ export ARTIFACTORY_HOME=/opt/artifactory
 export JAVA_HOME=/usr/lib/jvm/default
 
 export TOMCAT_HOME=$ARTIFACTORY_HOME/tomcat
-export ARTIFACTORY_PID=/run/artifactory/artifactory.pid
+export ARTIFACTORY_PID=/opt/artifactory/run/artifactory.pid
 
 export JAVA_OPTIONS="-server -Xms512m -Xmx2g -Xss256k -XX:+UseG1GC"
 export JAVA_OPTIONS="$JAVA_OPTIONS -Djruby.compile.invokedynamic=false -Dfile.encoding=UTF8 -Dartdist=zip -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
diff --git a/artifactory.service b/artifactory.service
index 58bed6c84f19..16ee655b1cd8 100644
--- a/artifactory.service
+++ b/artifactory.service
@@ -6,9 +6,9 @@ After=network.target
 Type=forking
 ExecStart=/opt/artifactory/bin/artifactory.sh start
 ExecStop=/opt/artifactory/bin/artifactory.sh stop
-PIDFile=/run/artifactory/artifactory.pid
+PIDFile=/opt/artifactory/run/artifactory.pid
 Restart=no
-#TimeoutSec=30
+TimeoutSec=30
 RemainAfterExit=yes
 User=artifactory