init: added GOOGLE_ANALYTICS_ID configuration option

Closes #230

Changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+**latest**
+- init: added GOOGLE_ANALYTICS_ID configuration option
+
 **7.6.2**
 - gitlab: upgrade to CE v.7.6.2
 

README.md

@@ -782,6 +782,7 @@ Below is the complete list of available options that can be used to customize yo
 - **JIRA_URL**: Location of the jira server, e.g. `-e 'JIRA_URL=https://jira.example.com'`. No defaults.
 - **USERMAP_UID**: Sets the uid for user `git` to the specified uid. Defaults to `1000`.
 - **USERMAP_GID**: Sets the gid for group `git` to the specified gid. Defaults to `USERMAP_UID` if defined, else defaults to `1000`.
+- **GOOGLE_ANALYTICS_ID**: Google Analytics ID. No defaults.
 - **PIWIK_URL**: Sets the Piwik URL. No defaults.
 - **PIWIK_SITE_ID**: Sets the Piwik site ID. No defaults.
 

assets/config/gitlabhq/gitlab.yml

@@ -287,7 +287,7 @@ production: &base
 
   extra:
     ## Google analytics. Uncomment if you want it
-    # google_analytics_id: '_your_tracking_id'
+    google_analytics_id: '{{GOOGLE_ANALYTICS_ID}}'
 
     ## Piwik analytics.
     piwik_url: '{{PIWIK_URL}}'

assets/init

@@ -111,6 +111,8 @@ OAUTH_TWITTER_APP_SECRET=${OAUTH_TWITTER_APP_SECRET:-}
 OAUTH_GITHUB_API_KEY=${OAUTH_GITHUB_API_KEY:-}
 OAUTH_GITHUB_APP_SECRET=${OAUTH_GITHUB_APP_SECRET:-}
 
+GOOGLE_ANALYTICS_ID=${GOOGLE_ANALYTICS_ID:-}
+
 PIWIK_URL=${PIWIK_URL:-}
 PIWIK_SITE_ID=${PIWIK_SITE_ID:-}
 
@@ -551,6 +553,13 @@ else
   sudo -u git -H sed '/{{OAUTH_GITHUB_SCOPE}}/d' -i config/gitlab.yml
 fi
 
+# google analytics
+if [ -n "${GOOGLE_ANALYTICS_ID}" ]; then
+  sudo -u git -H sed 's/{{GOOGLE_ANALYTICS_ID}}/'"${GOOGLE_ANALYTICS_ID}"'/' -i config/gitlab.yml
+else
+  sudo -u git -H sed '/{{GOOGLE_ANALYTICS_ID}}/d' -i config/gitlab.yml
+fi
+
 # piwik
 if [ -n "${PIWIK_URL}" -a -n "${PIWIK_SITE_ID}" ]; then
   sudo -u git -H sed 's,{{PIWIK_URL}},'"${PIWIK_URL}"',' -i config/gitlab.yml