Commit 028a557e authored by Nelson DINIS GONÇALVES's avatar Nelson DINIS GONÇALVES
Browse files

Merge branch 'develop' of forge.grandlyon.com:laclasse/etherpad

parents 541272b3 7147a01b
......@@ -29,7 +29,6 @@ Les variables optionnelles suivantes peuvent être configurées:
- **DB_PORT**: Port de la base de donnée (défaut: **3306**)
- **DB_USER**: Utilisateur de la base de donnée (défault: **etherpad**)
- **DB_NAME**: Nom de la base de donnée (défault: **etherpad**)
- **AUTH_URL**: URL interne pour vérifier les droits d'accès aux fichiers (default: **http://service/api/docs/current/isauthenticated**)
- **SSO_URL**: URL publique de base pour le SSO (défaut: **BASE_URL**)
Commandes
......
......@@ -12,13 +12,10 @@ fi
if [ -z "$DB_NAME" ]; then
export DB_NAME="etherpad"
fi
if [ -z "$AUTH_URL" ]; then
export AUTH_URL="http://service/api/docs/current/isauthenticated"
fi
if [ -z "$SSO_URL" ]; then
export SSO_URL="$BASE_URL"
fi
REPLACE_VARS='DB_HOST DB_PORT DB_USER DB_NAME DB_PASSWORD APIKEY AUTH_URL SSO_URL BASE_URL APP_ID APP_KEY'
REPLACE_VARS='DB_HOST DB_PORT DB_USER DB_NAME DB_PASSWORD APIKEY SSO_URL BASE_URL APP_ID APP_KEY'
# check if needed vars are present
if [ -z "$DB_PASSWORD" ] || [ -z "$APIKEY" ] || [ -z "$APP_ID" ] || [ -z "$APP_KEY" ] || [ -z "$BASE_URL" ]; then
......@@ -33,7 +30,6 @@ if [ -z "$DB_PASSWORD" ] || [ -z "$APIKEY" ] || [ -z "$APP_ID" ] || [ -z "$APP_K
echo " - DB_PORT: database port (default: 3306)"
echo " - DB_USER: database user (default: etherpad)"
echo " - DB_NAME: database name (default: etherpad)"
echo " - AUTH_URL: auth service URL (default: http://service/api/docs/current/isauthenticated)"
echo " - SSO_URL: sso service URL (default: BASE_URL)"
exit 1
fi
......
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