Merge pull request Normation#244 from Kegeruneku/bug_3929/int/set_def…

…ault_jetty_as_configfile Fixes #3929 - Get Jetty memory settings from /opt/rudder/etc/rudder-jett...
amousset · Mar 4, 2014 · 9ecd436 · 9ecd436
2 parents f1ebffb + bd7e022
commit 9ecd436
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 5 deletions.
diff --git a/rudder-jetty/SOURCES/rudder-jetty.conf b/rudder-jetty/SOURCES/rudder-jetty.conf
@@ -0,0 +1,8 @@
+# Java memory settings for Jetty.
+#
+# Defaults should be fine for standard setups,
+# might need to be adjusted for big Rudder
+# installations.
+
+JAVA_XMX=1024
+JAVA_MAXPERMSIZE=256
diff --git a/rudder-jetty/SOURCES/rudder-jetty.default b/rudder-jetty/SOURCES/rudder-jetty.default
@@ -1,11 +1,30 @@
+######################### WARNING ############################
+#                                                            #
+# Every modification done to this file will be lost at every #
+# Rudder update. To change Jetty memory settings, please use #
+# the /opt/rudder/etc/rudder-jetty.conf file instead         #
+#                                                            #
+######################### WARNING ############################
+
+# Source variables from /opt/rudder/etc/rudder-jetty.conf
+if [ -f /opt/rudder/etc/rudder-jetty.conf ]
+then
+	. /opt/rudder/etc/rudder-jetty.conf
+fi
+
 # Check wich JVM is installed
 # We support Sun Java 6 or OpenJDK 7, privilege later versions (sort -r)
 if [ -d /usr/lib/jvm ]; then JAVA_HOME=$(find /usr/lib/jvm -maxdepth 1 -type d -name java-7-openjdk-i386 -or -name java-7-openjdk-amd64 -or -name java-6-sun | sort -r | head -n1); fi
 if [ -d /usr/java ]; then JAVA_HOME=/usr/java/latest; fi
-#JAVA
+
+# Java VM location
 if [ -f ${JAVA_HOME}/bin/java ]; then JAVA=${JAVA_HOME}/bin/java; else JAVA=/usr/bin/java; fi
-JAVA_XMX=1024
-JAVA_MAXPERMSIZE=256
+
+# Memory settings
+JAVA_XMX=${JAVA_XMX:=1024}
+JAVA_MAXPERMSIZE=${JAVA_MAXPERMSIZE:=256}
+
+# Java VM arguments
 JAVA_OPTIONS="$JAVA_OPTIONS
 -server
 -Xms${JAVA_XMX}m -Xmx${JAVA_XMX}m
@@ -18,7 +37,8 @@ JAVA_OPTIONS="$JAVA_OPTIONS
 -Dinventoryweb.configFile=/opt/rudder/etc/inventory-web.properties
 -Dlogback.configurationFile=/opt/rudder/etc/logback.xml
 -Drun.mode=production"
-#JETTY
+
+# Jetty
 JETTY_HOME="/opt/rudder/jetty7/"
 JETTY_RUN="/var/rudder/run"
 JETTY_ARGS="OPTIONS=Server"

diff --git a/rudder-jetty/SPECS/rudder-jetty.spec b/rudder-jetty/SPECS/rudder-jetty.spec
@@ -53,6 +53,7 @@ Group: Applications/System
 
 #Source1: jetty7/bin/jetty.sh
 Source2: rudder-jetty.default
+Source3: rudder-jetty.conf
 
 Patch1: jetty-init-sles.patch
 Patch2: jetty-init-rudder.patch
@@ -124,6 +125,7 @@ echo "No build"
 rm -rf %{buildroot}
 
 mkdir -p %{buildroot}/opt/rudder
+mkdir -p %{buildroot}/opt/rudder/etc
 mkdir -p %{buildroot}%{rudderlogdir}/webapp
 mkdir -p %{buildroot}/var/rudder/run
 
@@ -137,6 +139,7 @@ mkdir -p %{buildroot}/etc/init.d
 mkdir -p %{buildroot}/etc/default
 install -m 755 jetty7/bin/jetty-sles.sh %{buildroot}/etc/init.d/rudder-jetty
 install -m 644 %{SOURCE2} %{buildroot}/etc/default/rudder-jetty
+install -m 644 %{SOURCE3} %{buildroot}/opt/rudder/etc/rudder-jetty.conf
 
 %pre -n rudder-jetty
 #=================================================
@@ -176,10 +179,12 @@ rm -rf %{buildroot}
 %files -n rudder-jetty
 %defattr(-, root, root, 0755)
 /opt/rudder/jetty7
+/opt/rudder/etc
 %{rudderlogdir}/webapp
 /var/rudder/run
 /etc/init.d/rudder-jetty
 /etc/default/rudder-jetty
+%config(noreplace) /opt/rudder/etc/rudder-jetty.conf
 
 #=================================================
 # Changelog

diff --git a/rudder-jetty/debian/conffiles b/rudder-jetty/debian/conffiles
@@ -0,0 +1 @@
+/opt/rudder/etc/rudder-jetty.conf
diff --git a/rudder-jetty/debian/dirs b/rudder-jetty/debian/dirs
@@ -1,2 +1,4 @@
+opt/rudder
+opt/rudder/etc
 var/rudder/run
 var/log/rudder/webapp/
diff --git a/rudder-jetty/debian/rules b/rudder-jetty/debian/rules
@@ -47,6 +47,7 @@ binary-arch: build install
 #	dh_installdocs
 #	dh_installexamples
 	dh_install --sourcedir=$(CURDIR)/SOURCES jetty7 /opt/rudder
+	dh_install --sourcedir=$(CURDIR)/SOURCES rudder-jetty.conf /opt/rudder/etc
 #	dh_installmenu
 #	dh_installdebconf
 #	dh_installlogrotate

diff --git a/rudder-server-root/SPECS/rudder-server-root.spec b/rudder-server-root/SPECS/rudder-server-root.spec
@@ -104,7 +104,6 @@ cp %{SOURCE5} %{buildroot}/etc/init.d/rudder-server-root
 cp %{SOURCE6} %{buildroot}%{rudderdir}/etc/
 cp %{SOURCE7} %{buildroot}%{rudderdir}/bin/
 
-
 %pre -n rudder-server-root
 #=================================================
 # Pre Installation