diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-07-30 21:23:37 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-07-30 21:33:35 +0530 |
| commit | 4b65549dee71790c9ed505f1a8a9ae75aca0e664 (patch) | |
| tree | 89ace730807015fe110f600ad46db5d195398ff6 | |
| parent | e66205366ee1272f443290c6dba22e8b1b88ce68 (diff) | |
| parent | bd1a2d85792a95f06cbde4766affe604763b0830 (diff) | |
Merge branch 'work'
| -rwxr-xr-x | build/create-rpms.sh | 3 | ||||
| -rw-r--r-- | build/glustermg.spec | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/build/create-rpms.sh b/build/create-rpms.sh index d6fda224..35745c90 100755 --- a/build/create-rpms.sh +++ b/build/create-rpms.sh @@ -1,2 +1,5 @@ cp glustermg-1.0.0.tar.gz /usr/src/redhat/SOURCES rpmbuild -bb build/glustermg.spec +rm -rf rpms +mkdir rpms +mv /usr/src/redhat/RPMS/x86_64/glustermg*.rpm rpms diff --git a/build/glustermg.spec b/build/glustermg.spec index cad7c2da..c4c4e4cb 100644 --- a/build/glustermg.spec +++ b/build/glustermg.spec @@ -61,7 +61,7 @@ if ! grep -q JAVA_HOME /etc/sysconfig/tomcat5; then echo JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64 >> /etc/sysconfig/tomcat5 fi if ! grep -q JAVA_OPTS /etc/sysconfig/tomcat5; then - echo 'JAVA_OPTS="-Xms1024m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"' >> /etc/sysconfig/tomcat5 + echo 'JAVA_OPTS="${JAVA_OPTS} -Xms1024m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"' >> /etc/sysconfig/tomcat5 fi if ! grep /usr/share/tomcat5/webapps/glustermg/ssl/gmg-ssl.keystore /usr/share/tomcat5/conf/server.xml; then cat >> /usr/share/tomcat5/conf/server.xml <<EOF |