From c6dbd4e004f4d51df877f6878e2b6b1f7875d18b Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Fri, 11 Dec 2015 21:52:54 +0530 Subject: [PATCH] rename `replace_placeholders` -> `update_template` --- assets/runtime/functions | 76 ++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index e849c7b4..da7d320d 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -40,7 +40,7 @@ install_template() { ## Replace placeholders with values # $1: file with placeholders to replace # $x: placeholders to replace -replace_placeholders() { +update_template() { local FILE=${1?missing argument} shift @@ -176,7 +176,7 @@ gitlab_configure_database() { gitlab_finalize_database_parameters gitlab_check_database_connection - replace_placeholders ${GITLAB_DATABASE_CONFIG} \ + update_template ${GITLAB_DATABASE_CONFIG} \ DB_ADAPTER DB_ENCODING DB_HOST DB_PORT DB_NAME DB_USER DB_PASS DB_POOL if [[ ${DB_ADAPTER} == postgresql ]]; then @@ -228,7 +228,7 @@ gitlab_configure_redis() { gitlab_finalize_redis_parameters gitlab_check_redis_connection - replace_placeholders ${GITLAB_RESQUE_CONFIG} \ + update_template ${GITLAB_RESQUE_CONFIG} \ REDIS_HOST \ REDIS_PORT } @@ -236,13 +236,13 @@ gitlab_configure_redis() { gitlab_configure_unicorn() { echo "Configuring gitlab::unicorn..." if [[ -n ${GITLAB_RELATIVE_URL_ROOT} ]]; then - replace_placeholders ${GITLAB_UNICORN_CONFIG} \ + update_template ${GITLAB_UNICORN_CONFIG} \ GITLAB_RELATIVE_URL_ROOT else exec_as_git sed -i "/{{GITLAB_RELATIVE_URL_ROOT}}/d" ${GITLAB_UNICORN_CONFIG} fi - replace_placeholders ${GITLAB_UNICORN_CONFIG} \ + update_template ${GITLAB_UNICORN_CONFIG} \ GITLAB_INSTALL_DIR \ UNICORN_WORKERS \ UNICORN_TIMEOUT @@ -250,7 +250,7 @@ gitlab_configure_unicorn() { gitlab_configure_timezone() { echo "Configuring gitlab::timezone..." - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ GITLAB_TIMEZONE } @@ -267,20 +267,20 @@ gitlab_configure_mail_delivery() { fi fi - replace_placeholders ${GITLAB_SMTP_CONFIG} \ + update_template ${GITLAB_SMTP_CONFIG} \ SMTP_USER SMTP_PASS SMTP_HOST SMTP_PORT SMTP_DOMAIN SMTP_STARTTLS SMTP_TLS SMTP_OPENSSL_VERIFY_MODE case ${SMTP_AUTHENTICATION} in "") exec_as_git sed -i "/{{SMTP_AUTHENTICATION}}/d" ${GITLAB_SMTP_CONFIG} ;; - *) replace_placeholders ${GITLAB_SMTP_CONFIG} SMTP_AUTHENTICATION ;; + *) update_template ${GITLAB_SMTP_CONFIG} SMTP_AUTHENTICATION ;; esac if [[ ${SMTP_CA_ENABLED} == true ]]; then if [[ -d ${SMTP_CA_PATH} ]]; then - replace_placeholders ${GITLAB_SMTP_CONFIG} SMTP_CA_PATH + update_template ${GITLAB_SMTP_CONFIG} SMTP_CA_PATH fi if [[ -f ${SMTP_CA_FILE} ]]; then - replace_placeholders ${GITLAB_SMTP_CONFIG} SMTP_CA_FILE + update_template ${GITLAB_SMTP_CONFIG} SMTP_CA_FILE fi else exec_as_git sed -i "/{{SMTP_CA_PATH}}/d" ${GITLAB_SMTP_CONFIG} @@ -288,7 +288,7 @@ gitlab_configure_mail_delivery() { fi fi - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ GITLAB_EMAIL_ENABLED GITLAB_EMAIL GITLAB_EMAIL_DISPLAY_NAME GITLAB_EMAIL_REPLY_TO } @@ -314,7 +314,7 @@ gitlab_configure_mailroom() { exec_as_git sed -i "/{{IMAP_MAILBOX}}/d" ${GITLAB_CONFIG} fi - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ GITLAB_INCOMING_EMAIL_ADDRESS GITLAB_INCOMING_EMAIL_ENABLED \ IMAP_USER IMAP_PASS IMAP_HOST IMAP_PORT IMAP_SSL IMAP_STARTTLS IMAP_MAILBOX @@ -325,7 +325,7 @@ gitlab_configure_mailroom() { gitlab_configure_ldap() { echo "Configuring gitlab::ldap..." - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ LDAP_ENABLED LDAP_HOST LDAP_PORT LDAP_UID LDAP_METHOD LDAP_BIND_DN LDAP_PASS LDAP_ACTIVE_DIRECTORY \ LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN LDAP_BLOCK_AUTO_CREATED_USERS LDAP_BASE LDAP_USER_FILTER LDAP_LABEL } @@ -334,7 +334,7 @@ gitlab_configure_oauth_google() { if [[ -n ${OAUTH_GOOGLE_API_KEY} && -n ${OAUTH_GOOGLE_APP_SECRET} ]]; then echo "Configuring gitlab::oauth::google..." OAUTH_ENABLED=${OAUTH_ENABLED:-true} - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ OAUTH_GOOGLE_API_KEY OAUTH_GOOGLE_APP_SECRET OAUTH_GOOGLE_RESTRICT_DOMAIN OAUTH_GOOGLE_APPROVAL_PROMPT else exec_as_git sed -i "/name: 'google_oauth2'/,/{{OAUTH_GOOGLE_RESTRICT_DOMAIN}}/d" ${GITLAB_CONFIG} @@ -345,7 +345,7 @@ gitlab_configure_oauth_facebook() { if [[ -n ${OAUTH_FACEBOOK_API_KEY} && -n ${OAUTH_FACEBOOK_APP_SECRET} ]]; then echo "Configuring gitlab::oauth::facebook..." OAUTH_ENABLED=${OAUTH_ENABLED:-true} - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ OAUTH_FACEBOOK_API_KEY OAUTH_FACEBOOK_APP_SECRET else exec_as_git sed -i "/name: 'facebook'/,/{{OAUTH_FACEBOOK_APP_SECRET}}/d" ${GITLAB_CONFIG} @@ -356,7 +356,7 @@ gitlab_configure_oauth_twitter() { if [[ -n ${OAUTH_TWITTER_API_KEY} && -n ${OAUTH_TWITTER_APP_SECRET} ]]; then echo "Configuring gitlab::oauth::twitter..." OAUTH_ENABLED=${OAUTH_ENABLED:-true} - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ OAUTH_TWITTER_API_KEY OAUTH_TWITTER_APP_SECRET else exec_as_git sed -i "/name: 'twitter'/,/{{OAUTH_TWITTER_APP_SECRET}}/d" ${GITLAB_CONFIG} @@ -367,7 +367,7 @@ gitlab_configure_oauth_github() { if [[ -n ${OAUTH_GITHUB_API_KEY} && -n ${OAUTH_GITHUB_APP_SECRET} ]]; then echo "Configuring gitlab::oauth::github..." OAUTH_ENABLED=${OAUTH_ENABLED:-true} - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ OAUTH_GITHUB_API_KEY OAUTH_GITHUB_APP_SECRET OAUTH_GITHUB_SCOPE else exec_as_git sed -i "/name: 'github'/,/{{OAUTH_GITHUB_SCOPE}}/d" ${GITLAB_CONFIG} @@ -378,7 +378,7 @@ gitlab_configure_oauth_gitlab() { if [[ -n ${OAUTH_GITLAB_API_KEY} && -n ${OAUTH_GITLAB_APP_SECRET} ]]; then echo "Configuring gitlab::oauth::gitlab..." OAUTH_ENABLED=${OAUTH_ENABLED:-true} - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ OAUTH_GITLAB_API_KEY OAUTH_GITLAB_APP_SECRET OAUTH_GITLAB_SCOPE else exec_as_git sed -i "/name: 'gitlab'/,/{{OAUTH_GITLAB_SCOPE}}/d" ${GITLAB_CONFIG} @@ -389,7 +389,7 @@ gitlab_configure_oauth_bitbucket() { if [[ -n ${OAUTH_BITBUCKET_API_KEY} && -n ${OAUTH_BITBUCKET_APP_SECRET} ]]; then echo "Configuring gitlab::oauth::bitbucket..." OAUTH_ENABLED=${OAUTH_ENABLED:-true} - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ OAUTH_BITBUCKET_API_KEY OAUTH_BITBUCKET_APP_SECRET else exec_as_git sed -i "/name: 'bitbucket'/,/{{OAUTH_BITBUCKET_APP_SECRET}}/d" ${GITLAB_CONFIG} @@ -404,7 +404,7 @@ gitlab_configure_oauth_saml() { -n ${OAUTH_SAML_NAME_IDENTIFIER_FORMAT} ]]; then echo "Configuring gitlab::oauth::saml..." OAUTH_ENABLED=${OAUTH_ENABLED:-true} - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ OAUTH_SAML_LABEL OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL OAUTH_SAML_IDP_CERT_FINGERPRINT \ OAUTH_SAML_IDP_SSO_TARGET_URL OAUTH_SAML_ISSUER OAUTH_SAML_NAME_IDENTIFIER_FORMAT else @@ -418,7 +418,7 @@ gitlab_configure_oauth_crowd() { -n ${OAUTH_CROWD_APP_PASSWORD} ]]; then echo "Configuring gitlab::oauth::crowd..." OAUTH_ENABLED=${OAUTH_ENABLED:-true} - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ OAUTH_CROWD_SERVER_URL OAUTH_CROWD_APP_NAME OAUTH_CROWD_APP_PASSWORD else exec_as_git sed -i "/name: 'crowd'/,/{{OAUTH_CROWD_APP_PASSWORD}}/d" ${GITLAB_CONFIG} @@ -438,12 +438,12 @@ gitlab_configure_oauth() { gitlab_configure_oauth_crowd OAUTH_ENABLED=${OAUTH_ENABLED:-false} - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ OAUTH_ENABLED OAUTH_ALLOW_SSO OAUTH_BLOCK_AUTO_CREATED_USERS OAUTH_AUTO_LINK_LDAP_USER case ${OAUTH_AUTO_SIGN_IN_WITH_PROVIDER} in google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd) - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ OAUTH_AUTO_SIGN_IN_WITH_PROVIDER ;; *) @@ -461,7 +461,7 @@ gitlab_configure_secrets() { return 1 fi - replace_placeholders ${GITLAB_SECRETS_CONFIG} GITLAB_SECRETS_DB_KEY_BASE + update_template ${GITLAB_SECRETS_CONFIG} GITLAB_SECRETS_DB_KEY_BASE } gitlab_configure_sidekiq() { @@ -515,7 +515,7 @@ gitlab_configure_backups_aws() { printf "\nMissing AWS options. Aborting...\n" return 1 fi - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ AWS_BACKUP_REGION AWS_BACKUP_ACCESS_KEY_ID AWS_BACKUP_SECRET_ACCESS_KEY AWS_BACKUP_BUCKET ;; *) @@ -526,7 +526,7 @@ gitlab_configure_backups_aws() { gitlab_configure_backups() { echo "Configuring gitlab::backups..." - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ GITLAB_BACKUP_DIR GITLAB_BACKUP_EXPIRY GITLAB_BACKUP_PG_SCHEMA GITLAB_BACKUP_ARCHIVE_PERMISSIONS gitlab_configure_backups_cron @@ -534,18 +534,18 @@ gitlab_configure_backups() { } gitlab_configure_gravatar() { - replace_placeholders ${GITLAB_CONFIG} GITLAB_GRAVATAR_ENABLED + update_template ${GITLAB_CONFIG} GITLAB_GRAVATAR_ENABLED if [[ -n ${GITLAB_GRAVATAR_HTTP_URL} ]]; then echo "Configuring gitlab::gravatar::http..." - replace_placeholders ${GITLAB_CONFIG} GITLAB_GRAVATAR_HTTP_URL + update_template ${GITLAB_CONFIG} GITLAB_GRAVATAR_HTTP_URL else exec_as_git sed -i "/{{GITLAB_GRAVATAR_HTTP_URL}}/d" ${GITLAB_CONFIG} fi if [[ -n ${GITLAB_GRAVATAR_HTTPS_URL} ]]; then echo "Configuring gitlab::gravatar::https..." - replace_placeholders ${GITLAB_CONFIG} GITLAB_GRAVATAR_HTTPS_URL + update_template ${GITLAB_CONFIG} GITLAB_GRAVATAR_HTTPS_URL else exec_as_git sed -i "/{{GITLAB_GRAVATAR_HTTPS_URL}}/d" ${GITLAB_CONFIG} fi @@ -554,7 +554,7 @@ gitlab_configure_gravatar() { gitlab_configure_analytics_google() { if [[ -n ${GOOGLE_ANALYTICS_ID} ]]; then echo "Configuring gitlab::analytics:google..." - replace_placeholders ${GITLAB_CONFIG} GOOGLE_ANALYTICS_ID + update_template ${GITLAB_CONFIG} GOOGLE_ANALYTICS_ID else exec_as_git sed -i "/{{GOOGLE_ANALYTICS_ID}}/d" ${GITLAB_CONFIG} fi @@ -563,7 +563,7 @@ gitlab_configure_analytics_google() { gitlab_configure_analytics_piwik() { if [[ -n ${PIWIK_URL} && -n ${PIWIK_SITE_ID} ]]; then echo "Configuring gitlab::analytics:piwik..." - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ PIWIK_URL \ PIWIK_SITE_ID else @@ -579,7 +579,7 @@ gitlab_configure_analytics() { gitlab_configure_rack_attack() { echo "Configuring gitlab::rack_attack..." - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ RACK_ATTACK_ENABLED \ RACK_ATTACK_WHITELIST \ RACK_ATTACK_MAXRETRY \ @@ -589,28 +589,28 @@ gitlab_configure_rack_attack() { gitlab_configure_ci() { echo "Configuring gitlab::ci..." - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ GITLAB_NOTIFY_ON_BROKEN_BUILDS \ GITLAB_NOTIFY_PUSHER GITLAB_BUILDS_DIR } gitlab_configure_artifacts() { echo "Configuring gitlab::artifacts..." - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ GITLAB_ARTIFACTS_ENABLED \ GITLAB_ARTIFACTS_DIR } gitlab_configure_lfs() { echo "Configuring gitlab::lfs..." - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ GITLAB_LFS_ENABLED \ GITLAB_LFS_OBJECTS_DIR } gitlab_configure_project_features() { echo "Configuring gitlab::project_features..." - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ GITLAB_PROJECTS_ISSUES \ GITLAB_PROJECTS_MERGE_REQUESTS \ GITLAB_PROJECTS_WIKI \ @@ -913,7 +913,7 @@ install_configuration_templates() { configure_gitlab() { echo "Configuring gitlab..." - replace_placeholders ${GITLAB_CONFIG} \ + update_template ${GITLAB_CONFIG} \ GITLAB_INSTALL_DIR \ GITLAB_SHELL_INSTALL_DIR \ GITLAB_DATA_DIR \ @@ -953,7 +953,7 @@ configure_gitlab() { configure_gitlab_shell() { echo "Configuring gitlab-shell..." - replace_placeholders ${GITLAB_SHELL_CONFIG} \ + update_template ${GITLAB_SHELL_CONFIG} \ GITLAB_RELATIVE_URL_ROOT \ GITLAB_HOME \ GITLAB_LOG_DIR \