diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-08-03 11:29:11 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-08-03 11:35:01 +0530 |
| commit | 09b9cdf60c13b20d231ddd70af87884420884be0 (patch) | |
| tree | c72059368c892e66502dd73766b23e2ba177cb3a /build/glustermg.spec | |
| parent | cb50f05f22530fb66d81c43aa54098926a6fc8eb (diff) | |
Modified to set correct path in JAVA_HOME in tomcat config file
Fixed Bug 3310 - rpm not copying id_rsa keys into /opt/glustermg/keys folder
Diffstat (limited to 'build/glustermg.spec')
| -rw-r--r-- | build/glustermg.spec | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/glustermg.spec b/build/glustermg.spec index 1eaaa004..fa34faa0 100644 --- a/build/glustermg.spec +++ b/build/glustermg.spec @@ -57,11 +57,11 @@ cp -pa gmg-scripts/* $RPM_BUILD_ROOT/opt/glustermg/%{release_version}/backend chown -R tomcat:tomcat /opt/glustermg /var/log/glustermg ln -fs /opt/glustermg/%{release_version}/glustermg /usr/share/tomcat5/webapps/glustermg if [ ! -f /opt/glustermg/keys/id_rsa ]; then - ssh-keygen -r rsa -f /opt/glustermg/keys/id_rsa -N gluster + ssh-keygen -t rsa -f /opt/glustermg/keys/id_rsa -N gluster fi -if ! grep -q '^JAVA_HOME="/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64"' /etc/sysconfig/tomcat5; then +if ! grep -q '^JAVA_HOME="/usr/lib/jvm/jre-1.6.0-openjdk.x86_64"' /etc/sysconfig/tomcat5; then sed -i 's/^JAVA_HOME=/# JAVA_HOME=/g' /etc/sysconfig/tomcat5 - echo 'JAVA_HOME="/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64"' >> /etc/sysconfig/tomcat5 + echo 'JAVA_HOME="/usr/lib/jvm/jre-1.6.0-openjdk.x86_64"' >> /etc/sysconfig/tomcat5 fi if ! grep -q '# Added by Gluster: JAVA_OPTS="${JAVA_OPTS} -Xms1024m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"' /etc/sysconfig/tomcat5; then echo '# Added by Gluster: JAVA_OPTS="${JAVA_OPTS} -Xms1024m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"' >> /etc/sysconfig/tomcat5 |