#489 make taupage config option naming consistent for enabling intros…

…pection, remove faulty support
zalando-stups · Apr 10, 2018 · 9a6adf7 · 9a6adf7
1 parent 36907ee
commit 9a6adf7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/build/setup.d/55-setup-taupage-yaml.sh b/build/setup.d/55-setup-taupage-yaml.sh
@@ -35,6 +35,3 @@ fi
 if [ -n "$TOKENINFO_BUSINESS_PARTNERS" ]; then
     echo "tokeninfo_business_partners: $TOKENINFO_BUSINESS_PARTNERS" >> /meta/taupage.yaml
 fi
-if [ -n "$TOKENINFO_ENABLE_INTROSPECTION" ]; then
-    echo "tokeninfo_enable_introspection: $TOKENINFO_ENABLE_INTROSPECTION" >> /meta/taupage.yaml
-fi
diff --git a/runtime/etc/init/planb-tokeninfo.conf b/runtime/etc/init/planb-tokeninfo.conf
@@ -14,7 +14,7 @@ script
         export OPENID_PROVIDER_CONFIGURATION_URL="$config_openid_provider_configuration_url"
         export REVOCATION_PROVIDER_URL="$config_revocation_provider_url"
         export BUSINESS_PARTNERS="$config_tokeninfo_business_partners"
-        if [ "$config_tokeninfo_introspection" = "true" ] || [ "$config_tokeninfo_introspection" = "True" ]; then
+        if [ "$config_planb_local_tokeninfo_introspection" = "true" ] || [ "$config_planb_local_tokeninfo_introspection" = "True" ]; then
                 export ENABLE_INTROSPECTION="true"
         fi
         /opt/taupage/bin/planb-tokeninfo