Commit da74a6ad authored by Leigh Stoller's avatar Leigh Stoller

Add PROTOGENI_RPCPORT, PROTOGENI_RPCNAME, and PROTOGENI_URL configure

variables for easier config in apache and protgeni code. The port
defaults to 12369, RPCNAME to $WWWHOST, and the URL is derived from
those two.
parent ccab647a
......@@ -819,6 +819,9 @@ REMOTEWIKIDOCS
PROTOGENI_SUPPORT
PROTOGENI_CLEARINGHOUSE
PROTOGENI_DOMAIN
PROTOGENI_RPCPORT
PROTOGENI_RPCNAME
PROTOGENI_URL
STANDALONE_CLEARINGHOUSE
GMAP_API_KEY
NODE_USAGE_SUPPORT
......@@ -4954,6 +4957,9 @@ done
......@@ -5044,6 +5050,9 @@ REMOTEWIKIDOCS=1
PROTOGENI_SUPPORT=0
PROTOGENI_CLEARINGHOUSE=0
PROTOGENI_DOMAIN="unknown"
# Will default to standard https port and host
PROTOGENI_RPCPORT=""
PROTOGENI_RPCNAME=""
STANDALONE_CLEARINGHOUSE=0
NODE_USAGE_SUPPORT=0
EXP_VIS_SUPPORT=0
......@@ -7166,6 +7175,19 @@ $as_echo "$as_me: WARNING: protogeni/rspec-geni submodule not intialized yet" >&
fi
fi
#
# Set the Protogeni URL, which depends on the the port and name.
#
if test -z "$PROTOGENI_RPCNAME"; then
PROTOGENI_RPCNAME=$WWW
fi
if test -z "$PROTOGENI_RPCPORT"; then
PROTOGENI_URL="https://$PROTOGENI_RPCNAME/protogeni/xmlrpc"
else
PROTOGENI_URL="https://$PROTOGENI_RPCNAME:$PROTOGENI_RPCPORT/protogeni/xmlrpc"
fi
#
# Determine the timezone (stupidity in PHP5, see apache/php.ini)
#
......
......@@ -217,6 +217,9 @@ AC_SUBST(REMOTEWIKIDOCS)
AC_SUBST(PROTOGENI_SUPPORT)
AC_SUBST(PROTOGENI_CLEARINGHOUSE)
AC_SUBST(PROTOGENI_DOMAIN)
AC_SUBST(PROTOGENI_RPCPORT)
AC_SUBST(PROTOGENI_RPCNAME)
AC_SUBST(PROTOGENI_URL)
AC_SUBST(STANDALONE_CLEARINGHOUSE)
AC_SUBST(GMAP_API_KEY)
AC_SUBST(NODE_USAGE_SUPPORT)
......@@ -315,6 +318,8 @@ REMOTEWIKIDOCS=1
PROTOGENI_SUPPORT=0
PROTOGENI_CLEARINGHOUSE=0
PROTOGENI_DOMAIN="unknown"
PROTOGENI_RPCPORT=12369
PROTOGENI_RPCNAME=""
STANDALONE_CLEARINGHOUSE=0
NODE_USAGE_SUPPORT=0
EXP_VIS_SUPPORT=0
......@@ -883,6 +888,19 @@ if test "$PROTOGENI_SUPPORT" = "1"; then
fi
fi
#
# Set the Protogeni URL, which depends on the the port and name.
#
if test -z "$PROTOGENI_RPCNAME"; then
PROTOGENI_RPCNAME=$WWW
fi
if test $PROTOGENI_RPCPORT -eq 443; then
AC_MSG_ERROR([The ProtoGENI RPC port cannot be 443 (https)]);
else
PROTOGENI_URL="https://$PROTOGENI_RPCNAME:$PROTOGENI_RPCPORT/protogeni/xmlrpc"
fi
#
# Determine the timezone (stupidity in PHP5, see apache/php.ini)
#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment