simplify force auth configuration for sonarqube - #986

opendevstack · Feb 21, 2022 · b3c991d · b3c991d
1 parent 7a56452
commit b3c991d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/sonarqube/configure.sh b/sonarqube/configure.sh
@@ -196,14 +196,6 @@ else
     echo_info "Default '${ADMIN_USER_NAME}' password is not in use."
 fi
 
-echo_info "Setting sonar.forceAuthentication=true ..."
-if ! curl ${INSECURE} -X POST -sSf --user "${ADMIN_USER_NAME}:${ADMIN_USER_PASSWORD}" \
-    "${SONARQUBE_URL}/api/settings/set?key=sonar.forceAuthentication&value=true"; then
-    echo_error "Could not enable sonar.forceAuthentication."
-    exit 1
-fi
-echo_info "sonar.forceAuthentication is enabled."
-
 echo_info "Checking if '${PIPELINE_USER_NAME}' exists ..."
 encodedPipelineUser="$(uriencode "${PIPELINE_USER_NAME}")"
 encodedPipelinePassword="$(uriencode "${ADMIN_USER_PASSWORD}")"

diff --git a/sonarqube/docker/run.sh b/sonarqube/docker/run.sh
@@ -13,6 +13,9 @@ if [ "${SONAR_AUTH_CROWD}" = "true" ]; then
   } >> conf/sonar.properties
 fi
 
+# enforce authentication to sonar
+echo "sonar.forceAuthentication=true" >> conf/sonar.properties
+
 # Copy plugins into volume
 rm "${SONARQUBE_HOME}"/extensions/plugins/*.jar || true
 ls -lah /opt/configuration/sonarqube/plugins