summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShireesh Anjal <shireesh@gluster.com>2011-11-28 15:42:52 +0530
committerShireesh Anjal <shireesh@gluster.com>2011-11-28 15:42:52 +0530
commit5145756b18e65431328297c6a111162eca69860a (patch)
treec3fca33616d4045e56b33d784e8ce8a064e13d6e
parentd8cf671c0e0b32d10c43e54f88723bfdcab8e8b8 (diff)
Modified to package the installation script with gmg when using gmc-build.sh
-rwxr-xr-xbuild/gmg-install.sh54
-rwxr-xr-xbuild/package-gateway.sh18
2 files changed, 48 insertions, 24 deletions
diff --git a/build/gmg-install.sh b/build/gmg-install.sh
index 016988df..398e1379 100755
--- a/build/gmg-install.sh
+++ b/build/gmg-install.sh
@@ -46,7 +46,20 @@ function post_install()
echo
}
-function configure_server()
+function create_links()
+{
+ ln -fs ${GMG_HOME_DIR}/glustermg ${WEBAPPS_DIR}
+
+ GMG_SCRIPTS_DIR="${GMG_HOME_DIR}/glustermg/scripts"
+ ln -sf ${GMG_SCRIPTS_DIR}/grun.py /usr/sbin/grun.py
+ ln -sf ${GMG_SCRIPTS_DIR}/add_user_cifs_all.py /usr/sbin/add_user_cifs_all.py
+ ln -sf ${GMG_SCRIPTS_DIR}/delete_user_cifs_all.py /usr/sbin/delete_user_cifs_all.py
+ ln -sf ${GMG_SCRIPTS_DIR}/setup_cifs_config_all.py /usr/sbin/setup_cifs_config_all.py
+ ln -sf ${GMG_SCRIPTS_DIR}/gmg-reset-password.sh /usr/sbin/gmg-reset-password.sh
+}
+
+# Update tomcat sysconfig file with java options
+function set_java_options()
{
TOMCAT_CONFIG_FILE="/etc/sysconfig/$TOMCAT_BIN"
if [ -f ${TOMCAT_CONFIG_FILE} ]; then
@@ -60,8 +73,13 @@ function configure_server()
echo 'JAVA_OPTS="${JAVA_OPTS} -Xms1024m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"' >> ${TOMCAT_CONFIG_FILE}
fi
fi
+}
- if ! grep -q ${GMG_HOME_DIR}/glustermg/ssl/gmg-ssl.keystore $TOMCAT_DIR/conf/server.xml; then
+function configure_ssl()
+{
+ TOMCAT_SERVER_CONFIG_FILE=${TOMCAT_DIR}/conf/server.xml
+ SSL_KEYSTORE_FILE=${WEBAPPS_DIR}/glustermg/ssl/gmg-ssl.keystore
+ if ! grep -q ${SSL_KEYSTORE_FILE} ${TOMCAT_SERVER_CONFIG_FILE}; then
sed -i '/<\/Service>/i \
<Connector SSLEnabled="true" \
clientAuth="false" \
@@ -73,21 +91,24 @@ function configure_server()
protocol="org.apache.coyote.http11.Http11Protocol" \
scheme="https" \
secure="true" \
- sslProtocol="TLS" />' $TOMCAT_DIR/conf/server.xml
- sed -i "s,keystoreFile=\"\$TOMCAT_DIR/webapps/glustermg/ssl/gmg-ssl.keystore\",keystoreFile=\"$TOMCAT_DIR/webapps/glustermg/ssl/gmg-ssl.keystore\"," $TOMCAT_DIR/conf/server.xml
+ sslProtocol="TLS" />' ${TOMCAT_SERVER_CONFIG_FILE}
+ sed -i "s,keystoreFile=\"\$TOMCAT_DIR/webapps/glustermg/ssl/gmg-ssl.keystore\",keystoreFile=\"${SSL_KEYSTORE_FILE}\"," ${TOMCAT_SERVER_CONFIG_FILE}
fi
+}
+
+function enable_proxy_caching()
+{
if ! grep -q "org.apache.catalina.authenticator.NonLoginAuthenticator" $TOMCAT_DIR/conf/context.xml; then
sed -i '/<\/Context>/i \
<Valve className="org.apache.catalina.authenticator.NonLoginAuthenticator" \
disableProxyCaching="false" />' $TOMCAT_DIR/conf/context.xml
fi
-
- GMG_SCRIPTS_DIR="${GMG_HOME_DIR}/glustermg/scripts"
- ln -sf ${GMG_SCRIPTS_DIR}/grun.py /usr/sbin/grun.py
- ln -sf ${GMG_SCRIPTS_DIR}/add_user_cifs_all.py /usr/sbin/add_user_cifs_all.py
- ln -sf ${GMG_SCRIPTS_DIR}/delete_user_cifs_all.py /usr/sbin/delete_user_cifs_all.py
- ln -sf ${GMG_SCRIPTS_DIR}/setup_cifs_config_all.py /usr/sbin/setup_cifs_config_all.py
- ln -sf ${GMG_SCRIPTS_DIR}/gmg-reset-password.sh /usr/sbin/gmg-reset-password.sh
+}
+
+function configure_server()
+{
+ set_java_options
+ enable_proxy_caching
}
function make_dirs()
@@ -100,7 +121,6 @@ function make_dirs()
chown -R tomcat:tomcat $GMG_HOME_DIR $GMG_LOG_DIR;
}
-
function check_tar_gz()
{
file $GMG_ARCHIVE_PATH | grep "gzip" > /dev/null;
@@ -109,7 +129,7 @@ function check_tar_gz()
fi
}
-function get_GMG_VERSION()
+function get_gmg_version()
{
# Format is /path/to/glustermg-version.war.tar.gz
# Remove prefix
@@ -117,12 +137,12 @@ function get_GMG_VERSION()
# Remove suffix
GMG_VERSION=${PART1%.war.tar.gz}
- GMG_HOME_DIR="${GMG_HOME_DIR}/${GMG_VERSION}";
+ GMG_HOME_DIR="${GMG_ROOT_DIR}/${GMG_VERSION}";
}
function check_tomcat_dir()
{
- WEBAPPS_DIR="${TOMCAT_DIR}/webapps/"
+ WEBAPPS_DIR="${TOMCAT_DIR}/webapps"
if [ ! -d "${WEBAPPS_DIR}" ]; then
quit "There is no webapps directory in [${TOMCAT_DIR}]." ${TOMCAT_ERR}
fi
@@ -145,7 +165,7 @@ function check_java_version()
function install_gmg()
{
tar -xvf ${GMG_ARCHIVE_PATH} -C ${GMG_HOME_DIR}
- ln -fs ${GMG_HOME_DIR}/glustermg ${WEBAPPS_DIR}
+ create_links
}
#-----------------------------------
@@ -163,7 +183,7 @@ TOMCAT_DIR="$2";
check_tomcat_dir
check_java_version
check_tar_gz
-get_GMG_VERSION
+get_gmg_version
make_dirs
install_gmg
diff --git a/build/package-gateway.sh b/build/package-gateway.sh
index 9e9444ef..c286e427 100755
--- a/build/package-gateway.sh
+++ b/build/package-gateway.sh
@@ -22,8 +22,10 @@
WAR_NAME="glustermg.war"
WAR_SCRIPTS_DIR=${WAR_NAME}/scripts
NEW_WAR_NAME="glustermg"
+VERSION=${VERSION:-1.0.0}
TAR_NAME=${NEW_WAR_NAME}-${VERSION}.war.tar
-SERVER_DIST_DIR=${DIST_DIR:-${WORKSPACE}/buckminster.output}
+INSTALL_SCRIPT_NAME=gmg-install.sh
+INSTALLER_TAR_NAME=gmg-installer-${VERSION}.war.tar
prepare-dist-dir()
{
@@ -82,10 +84,10 @@ get-dist()
get-console-dists()
{
- get-dist x86 win32 win32
- get-dist x86_64 win32 win32
get-dist x86 linux gtk
get-dist x86_64 linux gtk
+ get-dist x86 win32 win32
+ get-dist x86_64 win32 win32
get-dist x86 macosx cocoa
get-dist x86_64 macosx cocoa
}
@@ -105,6 +107,7 @@ if [ $# -eq 2 ]; then
DIST_DIR=${1}
GMC_DIST_DIR=${2}
fi
+SERVER_DIST_DIR=${DIST_DIR:-${WORKSPACE}/buckminster.output}
echo "Packaging GlusterFS Management Gateway..."
@@ -115,12 +118,13 @@ get-console-dists
/bin/mv -f ${WAR_NAME} ${NEW_WAR_NAME}
/bin/rm -rf ${TAR_NAME} ${TAR_NAME}.gz
-tar cvf ${TAR_NAME} ${NEW_WAR_NAME}
-gzip ${TAR_NAME}
+tar cvfz ${TAR_NAME}.gz ${NEW_WAR_NAME}
+cp build/${INSTALL_SCRIPT_NAME} .
+
+tar cvfz ${INSTALLER_TAR_NAME}.gz ${TAR_NAME}.gz ${INSTALL_SCRIPT_NAME}
if [ ! -z "${DIST_DIR}" ]; then
- mv ${TAR_NAME}.gz ${DIST_DIR}
- cp -f build/gmg-install.sh ${DIST_DIR}
+ mv ${INSTALLER_TAR_NAME}.gz ${DIST_DIR}
fi
echo "Done!"