upgrade to 2.0.0_alpha.1 which supports e/s>2.0

4 files changed, 21 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16bdb15b97a8..cef7da2384a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,25 @@
 # Generated by mksrcinfo v8
-# Tue Jan 19 09:17:43 UTC 2016
+# Thu Feb  4 12:33:37 UTC 2016
 pkgbase = graylog
 	pkgdesc = Graylog is an open source syslog implementation that stores your logs in ElasticSearch and MongoDB
-	pkgver = 1.3.3
+	pkgver = 2.0.0_alpha.1
 	pkgrel = 1
 	url = https://www.graylog.org/
 	install = graylog.install
 	arch = any
 	license = GPL
-	depends = java-runtime
-	depends = elasticsearch<2.0
-	depends = mongodb
+	depends = java-runtime-headless
+	optdepends = elasticsearch>2.0
+	optdepends = mongodb
+	conflicts = graylog2-server
+	conflicts = graylog-web-interface
 	replaces = graylog2-server
+	replaces = graylog-web-interface
 	backup = etc/graylog/server/server.conf
-	source = https://packages.graylog2.org/releases/graylog2-server/graylog-1.3.3.tgz
+	source = https://packages.graylog2.org/releases/graylog/graylog-2.0.0-alpha.1.tgz
 	source = graylog-tmpfiles.conf
 	source = graylog.service
-	sha256sums = 1e98509376dc22ff1602838cebb49b4732618296acc58063ba34f4a97f667ba0
+	sha256sums = 6962b7b2d9809e782f229c187e54674029882ee2caacabaa02161a020b3cb3b5
 	sha256sums = SKIP
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index d98364ac4b41..0109759495c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,30 @@
 # Maintainer: Spider.007 <aur@spider007.net>
 pkgname=graylog
-replaces=graylog2-server
-pkgver=1.3.3
+replaces=(graylog2-server graylog-web-interface)
+conflicts=(${replaces[*]})
+pkgver=2.0.0_alpha.1
 pkgrel=1
 pkgdesc="Graylog is an open source syslog implementation that stores your logs in ElasticSearch and MongoDB"
 arch=('any')
 url="https://www.graylog.org/"
-license=('GPL')
-depends=(java-runtime 'elasticsearch<2.0' mongodb)
+license=(GPL)
+depends=(java-runtime-headless)
+optdepends=('elasticsearch>2.0' mongodb)
 install=graylog.install
 backup=(
 	etc/graylog/server/server.conf
 )
 source=(
-	https://packages.graylog2.org/releases/$replaces/$pkgname-$pkgver.tgz
+	https://packages.graylog2.org/releases/$pkgname/$pkgname-${pkgver/_/-}.tgz
 	graylog-tmpfiles.conf
 	graylog.service
 )
-sha256sums=('1e98509376dc22ff1602838cebb49b4732618296acc58063ba34f4a97f667ba0'
+sha256sums=('6962b7b2d9809e782f229c187e54674029882ee2caacabaa02161a020b3cb3b5'
             'SKIP'
             'SKIP')
 
 package() {
-	cd "$srcdir/$pkgname-${pkgver}"
+	cd "$srcdir/$pkgname-${pkgver/_/-}"
 
 	mkdir -p $pkgdir/var/lib/graylog/{spool,data/journal,log}
 	chown nobody: -R $pkgdir/var/lib/graylog/
diff --git a/graylog.install b/graylog.install
index 3496bd90de7c..5fc40cd1b682 100644
--- a/graylog.install
+++ b/graylog.install
@@ -1,16 +1,6 @@
 post_install() {
     usr/bin/systemd-tmpfiles --create graylog-server.conf
 
-	# this specific upgrade was don by replacing graylog2 with graylog; therefore we are uninstalled&reinstalled
-	cat <<EOF
-Major upgrade; graylog2 has been renamed to graylog and the following files where renamed:
- * /etc/graylog2.conf to /etc/graylog/server/server.conf
- * /etc/graylog2-server-node-id to /etc/graylog/server/node-id
-
-You can copy your 0.9x config but you should add
- * message_journal_enabled = true
- * message_journal_dir = /usr/lib/graylog/data/journal
-
-also; don't forget to update the node_id_file
+	[[ $2 == 1.* ]] && echo 'graylog now includes graylog-web-interface. You might need to add elasticsearch_cluster_name to server.conf'
 EOF
 }
diff --git a/graylog.service b/graylog.service
index 31198f5ca2d8..ec14c2e44848 100644
--- a/graylog.service
+++ b/graylog.service
@@ -6,7 +6,7 @@ Requires=mongodb.service
 [Service]
 User=nobody
 PIDFile=/run/graylog/server.pid
-ExecStart=/usr/bin/java -Djava.net.preferIPv6Addresses=true -jar /usr/lib/graylog/server.jar server -f /etc/graylog/server/server.conf -p /run/graylog/server.pid
+ExecStart=/usr/bin/java -Djava.net.preferIPv6Addresses=true -Djava.library.path=/usr/lib/graylog/lib/sigar -jar /usr/lib/graylog/server.jar server -f /etc/graylog/server/server.conf -p /run/graylog/server.pid
 
 [Install]
 WantedBy=multi-user.target