certificates/dehydrated-cron
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dont't configure gitlab-ce for SSL (https), if no certificates present.

Browse Source
This commit is contained in:
Christoph 2019-05-14 14:34:42 +02:00
parent 873368edfe
commit aa1557a6d7
1 changed files with 69 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
install_dehydrated.sh
View File

@ -529,13 +529,19 @@ EOF
echo_skipped echo_skipped
fi fi
if [[ ! -d "/var/lib/dehydrated/certs/${HOST_NAME}" ]]; then
URL_SCHEMA="http"
else
URL_SCHEMA="https"
fi
echononl " Adjust ${GITLAB_CONF_FILE} - external_url" echononl " Adjust ${GITLAB_CONF_FILE} - external_url"
if ! grep -E "^\s*external_url" $GITLAB_CONF_FILE 2> /dev/null | grep -q -E "${HOST_NAME}" 2> /dev/null ; then if ! grep -E "^\s*external_url" $GITLAB_CONF_FILE 2> /dev/null | grep -q -E "${HOST_NAME}" 2> /dev/null ; then
if grep -q -E "^\s*external_url" $GITLAB_CONF_FILE 2> /dev/null ; then if grep -q -E "^\s*external_url" $GITLAB_CONF_FILE 2> /dev/null ; then
perl -i -n -p -e "s#^(\s*(external_url).*)#\#\# \1\n\2 'https://${HOST_NAME}'#" $GITLAB_CONF_FILE perl -i -n -p -e "s#^(\s*(external_url).*)#\#\# \1\n\2 '${URL_SCHEMA}://${HOST_NAME}'#" $GITLAB_CONF_FILE
if [[ $? -eq 0 ]] ; then if [[ $? -eq 0 ]] ; then
echo_ok echo_ok
gitlab_reconfigure=true gitlab_reconfigure=true
@ -550,7 +556,7 @@ EOF
## Added by dehydrated install script $(basename $0) ## Added by dehydrated install script $(basename $0)
################################################################################ ################################################################################
external_url 'https://${HOST_NAME}' external_url '${URL_SCHEMA}://${HOST_NAME}'
EOF EOF
if [[ $? -eq 0 ]] ; then if [[ $? -eq 0 ]] ; then
@ -560,7 +566,7 @@ EOF
echo_failed echo_failed
fi fi
else else
perl -i -n -p -e "s#^(\s*\#\s*(external_url).*)#\1\n\2 'https://${HOST_NAME}'#" $GITLAB_CONF_FILE perl -i -n -p -e "s#^(\s*\#\s*(external_url).*)#\1\n\2 '${URL_SCHEMA}://${HOST_NAME}'#" $GITLAB_CONF_FILE
if [[ $? -eq 0 ]] ; then if [[ $? -eq 0 ]] ; then
echo_ok echo_ok
gitlab_reconfigure=true gitlab_reconfigure=true
@ -637,6 +643,8 @@ EOF
echo_skipped echo_skipped
fi fi
if [[ ! -d "/var/lib/dehydrated/certs/${HOST_NAME}" ]]; then
echononl " Adjust ${GITLAB_CONF_FILE} - nginx['redirect_http_to_https']" echononl " Adjust ${GITLAB_CONF_FILE} - nginx['redirect_http_to_https']"
if ! grep -E "^\s*nginx\['redirect_http_to_https'\]" $GITLAB_CONF_FILE 2> /dev/null | grep -q -E "true" 2> /dev/null ; then if ! grep -E "^\s*nginx\['redirect_http_to_https'\]" $GITLAB_CONF_FILE 2> /dev/null | grep -q -E "true" 2> /dev/null ; then
@ -726,6 +734,8 @@ EOF
fi fi
fi
if [[ -d "$DH_WELL_KNOWN_DIR" ]]; then if [[ -d "$DH_WELL_KNOWN_DIR" ]]; then
echononl " Backup \"$DH_WELL_KNOWN_DIR\" directory.." echononl " Backup \"$DH_WELL_KNOWN_DIR\" directory.."