Pages update

README.md

@@ -1594,6 +1594,14 @@ Client Secret from earlier generated OAuth application
 
 Redirect URI, non existing pages domain to redirect to pages daemon, `https://projects.example.io/auth`
 
+##### `GITLAB_PAGES_NAMESPACE_IN_PATH`
+
+Enable namespace-in-path option for gitlab pages, defaults to `false`.
+
+##### `GITLAB_PAGES_LOG_VERBOSE`
+
+Enable verbose logging for gitlab pages, defaults to `false`.
+
 ##### `GITLAB_HTTPS`
 
 Set to `true` to enable https support, disabled by default.

assets/runtime/config/gitlab-pages/config

@@ -4,5 +4,7 @@ auth-redirect-uri={{GITLAB_PAGES_ACCESS_REDIRECT_URI}}
 auth-secret={{GITLAB_PAGES_ACCESS_SECRET}}
 gitlab-server={{GITLAB_PAGES_ACCESS_CONTROL_SERVER}}
 artifacts-server={{GITLAB_PAGES_ARTIFACTS_SERVER_URL}}
-internal-gitlab-server=http://localhost:8181
+internal-gitlab-server=http://127.0.0.1:8080{{GITLAB_RELATIVE_URL_ROOT}}
 api-secret-key={{GITLAB_INSTALL_DIR}}/.gitlab_pages_secret
+log-verbose={{GITLAB_PAGES_LOG_VERBOSE}}
+namespace-in-path={{GITLAB_PAGES_NAMESPACE_IN_PATH}}

assets/runtime/config/gitlabhq/gitlab.yml

@@ -410,6 +410,7 @@ production: &base
     artifacts_server: {{GITLAB_PAGES_ARTIFACTS_SERVER}} # Set to false if you want to disable online view of HTML artifacts
     external_http: {{GITLAB_PAGES_EXTERNAL_HTTP}} # If defined, enables custom domain support in GitLab Pages
     external_https: {{GITLAB_PAGES_EXTERNAL_HTTPS}} # If defined, enables custom domain and certificate support in GitLab Pages
+    namespace_in_path: {{GITLAB_PAGES_NAMESPACE_IN_PATH}}
 
     # File that contains the shared secret key for verifying access for gitlab-pages.
     # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app).

assets/runtime/env-defaults

@@ -617,6 +617,8 @@ GITLAB_PAGES_ACCESS_CLIENT_ID=${GITLAB_PAGES_ACCESS_CLIENT_ID:-}
 GITLAB_PAGES_ACCESS_CLIENT_SECRET=${GITLAB_PAGES_ACCESS_CLIENT_SECRET:-}
 GITLAB_PAGES_ACCESS_REDIRECT_URI=${GITLAB_PAGES_ACCESS_REDIRECT_URI:-}
 GITLAB_PAGES_NGINX_PROXY=${GITLAB_PAGES_NGINX_PROXY:-true}
+GITLAB_PAGES_NAMESPACE_IN_PATH=${GITLAB_PAGES_NAMESPACE_IN_PATH:-false}
+GITLAB_PAGES_LOG_VERBOSE=${GITLAB_PAGES_LOG_VERBOSE:-false}
 
 ## Gitaly
 GITALY_CLIENT_PATH=${GITALY_CLIENT_PATH:-$GITLAB_GITALY_INSTALL_DIR}

assets/runtime/functions

@@ -1412,7 +1412,8 @@ gitlab_configure_pages(){
     GITLAB_PAGES_PORT \
     GITLAB_PAGES_HTTPS \
     GITLAB_PAGES_ARTIFACTS_SERVER \
-    GITLAB_PAGES_ACCESS_CONTROL
+    GITLAB_PAGES_ACCESS_CONTROL \
+    GITLAB_PAGES_NAMESPACE_IN_PATH
 
   if [[ -n ${GITLAB_PAGES_EXTERNAL_HTTP} ]]; then
     update_template ${GITLAB_CONFIG} \
@@ -2153,6 +2154,8 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
       GITLAB_PAGES_ACCESS_REDIRECT_URI \
       GITLAB_PAGES_ACCESS_SECRET \
       GITLAB_PAGES_ACCESS_CONTROL_SERVER \
+      GITLAB_PAGES_NAMESPACE_IN_PATH \
+      GITLAB_PAGES_LOG_VERBOSE \
       GITLAB_INSTALL_DIR
 
   if [[ -n ${GITLAB_PAGES_ARTIFACTS_SERVER_URL} ]]; then
@@ -2162,6 +2165,9 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
   fi
 else
   update_template ${GITLAB_PAGES_CONFIG} \
+      GITLAB_RELATIVE_URL_ROOT \
+      GITLAB_PAGES_NAMESPACE_IN_PATH \
+      GITLAB_PAGES_LOG_VERBOSE \
       GITLAB_INSTALL_DIR
 
   exec_as_git sed -i "/{{GITLAB_PAGES_ACCESS_CLIENT_ID}}/d" ${GITLAB_PAGES_CONFIG}