moved running pid out of graylog2-web-interface folder. updates now a…

…ctually work
soudmaijer · Feb 25, 2014 · acc9114 · acc9114
1 parent 0da59d6
commit acc9114
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Run default recipe to install server with web interface.
 
 Graylog2 server
 
-* default[:graylog2][:server_version] = '0.20.0-rc.2'
+* default[:graylog2][:server_version] = '0.20.0'
 * default[:graylog2][:server_home] = '/opt/graylog2-server'
 * default[:graylog2][:server_user] = 'graylog2'
 * default[:graylog2][:server_group] = 'graylog2'
@@ -32,7 +32,7 @@ Graylog2 server
 
 Graylog2 web interface
 
-* default[:graylog2][:server_version] = '0.20.0-rc.2'
+* default[:graylog2][:server_version] = '0.20.0'
 * default[:graylog2][:server_home] = '/opt/graylog2-server'
 * default[:graylog2][:server_user] = 'graylog2'
 * default[:graylog2][:server_group] = 'graylog2'

diff --git a/attributes/server.rb b/attributes/server.rb
@@ -4,7 +4,7 @@
 override[:elasticsearch][:allocated_memory] = "512m"
 override[:elasticsearch][:plugins] = {"mobz/elasticsearch-head" => ""}
 
-default[:graylog2][:server_version] = '0.20.0'
+default[:graylog2][:server_version] = '0.20.1'
 default[:graylog2][:server_home] = '/opt/graylog2-server'
 default[:graylog2][:server_user] = 'graylog2'
 default[:graylog2][:server_group] = 'graylog2'

diff --git a/attributes/web-interface.rb b/attributes/web-interface.rb
@@ -1,4 +1,4 @@
-default[:graylog2][:web_version] = '0.20.0'
+default[:graylog2][:web_version] = '0.20.1'
 default[:graylog2][:web_home] = '/opt/graylog2-web-interface'
 default[:graylog2][:web_user] = 'graylog2-web'
 default[:graylog2][:web_service_name] = 'graylog2-web-interface'

diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license          'All rights reserved'
 description      'Installs/Configures graylog2'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.0.2'
+version          '1.0.3'
 
 recipe "graylog2::default", "Installs and configures a graylog2 server"
 recipe "graylog2::server", "Installs and configures a graylog2 server"

diff --git a/templates/default/graylog2-web-interface.init.erb b/templates/default/graylog2-web-interface.init.erb
@@ -15,7 +15,7 @@
 APP=<%= node[:graylog2][:web_service_name] %>
 APP_PATH=<%= node[:graylog2][:web_home] %>
 NOHUP=`which nohup`
-GRAYLOG2_PID=$APP_PATH/RUNNING_PID
+GRAYLOG2_PID=/var/run/<%= node[:graylog2][:web_service_name] %>
 
 test -x /usr/bin/java || exit 0
 
@@ -24,7 +24,7 @@ set -e
 start() {
   echo "Starting $APP ..."
   cd $APP_PATH/bin
-  $NOHUP ./$APP -mem <%= node[:graylog2][:web_mem] %> &
+  $NOHUP ./$APP -mem <%= node[:graylog2][:web_mem] %> -Dpidfile.path=$GRAYLOG2_PID &
 }
 
 stop() {