From ad57dce0151fbe3dca1de8e61ce36bb4493efd6d Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 22 Apr 2014 21:33:56 +0530 Subject: [PATCH 1/6] removed packaged config.tar.bz2 --- assets/config.tar.bz2 | Bin 7848 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 assets/config.tar.bz2 diff --git a/assets/config.tar.bz2 b/assets/config.tar.bz2 deleted file mode 100644 index 87e59fe9a0164c77fad4c96c8a3424f1ef3ba3b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7848 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 G2-`4LQ^$J% From 0c20a305604ff2674ef7a16816430b07350893b3 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 22 Apr 2014 21:35:42 +0530 Subject: [PATCH 2/6] upgraded to gitlab-ce version 6.8.0 --- Changelog.md | 1 + README.md | 4 ++-- assets/config/gitlabhq/gitlab.yml | 20 +++++++++++++++----- assets/config/nginx/gitlab | 15 +++++++++++++-- assets/setup/install | 2 +- 5 files changed, 32 insertions(+), 10 deletions(-) diff --git a/Changelog.md b/Changelog.md index 6d748b93..79c2a486 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,7 @@ # Changelog **latest** +- upgraded to gitlab-ce version 6.8.0 - added support for linking with redis container. - use sameersbn/ubuntu as the base docker image - install postgresql-client to fix restoring backups when used with a postgresql database backend. diff --git a/README.md b/README.md index f2138087..2190a0e4 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Dockerfile to build a GitLab container image. ## Version -Current Version: 6.7.5 +Current Version: 6.8.0 # Hardware Requirements @@ -91,7 +91,7 @@ docker pull sameersbn/gitlab:latest Since version 6.3.0, the image builds are being tagged. You can now pull a particular version of gitlab by specifying the version number. For example, ```bash -docker pull sameersbn/gitlab:6.7.5 +docker pull sameersbn/gitlab:6.8.0 ``` Alternately you can build the image yourself. diff --git a/assets/config/gitlabhq/gitlab.yml b/assets/config/gitlabhq/gitlab.yml index e554b637..cc911dd9 100644 --- a/assets/config/gitlabhq/gitlab.yml +++ b/assets/config/gitlabhq/gitlab.yml @@ -20,7 +20,7 @@ production: &base https: {{GITLAB_HTTPS}} # Uncomment and customize the last line to run in a non-root path - # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this. + # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this. # Note that four settings need to be changed for this to work. # 1) In your application.rb file: config.relative_url_root = "/gitlab" # 2) In your gitlab.yml file: relative_url_root: /gitlab @@ -54,8 +54,12 @@ production: &base ## Users management - # default: false - Account passwords are not sent via the email if signup is enabled. + # default: false - Account passwords are not sent via the email if signup is enabled. signup_enabled: {{GITLAB_SIGNUP}} + # + # default: true - If set to false, standard login form won't be shown on the sign-in page + # signin_enabled: false + # Restrict setting visibility levels for non-admin users. # The default is to allow all levels. @@ -65,7 +69,7 @@ production: &base # If a commit message matches this regular expression, all issues referenced from the matched text will be closed. # This happens when the commit is pushed or merged into the default branch of a project. # When not specified the default issue_closing_pattern as specified below will be used. - # issue_closing_pattern: '([Cc]lose[sd]|[Ff]ixe[sd]) +#\d+' + # issue_closing_pattern: '([Cc]lose[sd]|[Ff]ixe[sd]) #(\d+)' ## Default project features settings default_projects_features: @@ -76,6 +80,11 @@ production: &base snippets: false visibility_level: "private" # can be "private" | "internal" | "public" + ## Repository downloads directory + # When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory. + # The default is 'tmp/repositories' relative to the root of the Rails app. + # repository_downloads_path: tmp/repositories + ## External issues trackers issues_tracker: # redmine: @@ -98,7 +107,7 @@ production: &base # ## :project_id - GitLab project identifier # ## :issues_tracker_id - Project Name or Id in external issue tracker # new_issue_url: "http://redmine.sample/projects/:issues_tracker_id/issues/new" - # + # # jira: # title: "Atlassian Jira" # project_url: "http://jira.sample/issues/?jql=project=:issues_tracker_id" @@ -166,9 +175,10 @@ production: &base ## Auth providers # Uncomment the following lines and fill in the data of the auth provider you want to use # If your favorite auth provider is not listed you can use others: - # see https://github.com/gitlabhq/gitlab-public-wiki/wiki/Working-custom-omniauth-provider-configurations + # see https://github.com/gitlabhq/gitlab-public-wiki/wiki/Custom-omniauth-provider-configurations # The 'app_id' and 'app_secret' parameters are always passed as the first two # arguments, followed by optional 'args' which can be either a hash or an array. + # Documentation for this is available at http://doc.gitlab.com/ce/integration/omniauth.html providers: # - { name: 'google_oauth2', app_id: 'YOUR APP ID', # app_secret: 'YOUR APP SECRET', diff --git a/assets/config/nginx/gitlab b/assets/config/nginx/gitlab index 7b1774bc..26469245 100644 --- a/assets/config/nginx/gitlab +++ b/assets/config/nginx/gitlab @@ -42,6 +42,10 @@ server { # if a file, which is not found in the root folder is requested, # then the proxy pass the request to the upsteam (gitlab unicorn) location @gitlab { + # If you use https make sure you disable gzip compression + # to be safe against BREACH attack + # gzip off; + proxy_read_timeout 300; # Some requests take more than 30 seconds. proxy_connect_timeout 300; # Some requests take more than 30 seconds. proxy_redirect off; @@ -54,6 +58,13 @@ server { proxy_pass http://gitlab; } - error_page 502 /502.html; -} + # Enable gzip compression as per rails guide: http://guides.rubyonrails.org/asset_pipeline.html#gzip-compression + location ~ ^/(assets)/ { + root /home/git/gitlab/public; + gzip_static on; # to serve pre-gzipped version + expires max; + add_header Cache-Control public; + } + error_page 502 /502.html; +} \ No newline at end of file diff --git a/assets/setup/install b/assets/setup/install index f605a3ed..1640c778 100755 --- a/assets/setup/install +++ b/assets/setup/install @@ -1,7 +1,7 @@ #!/bin/bash set -e -GITLAB_VERSION=6.7.5 +GITLAB_VERSION=6.8.0 SHELL_VERSION=1.9.1 # add git user From 669e843eba7add15d084327c1cbb42173d56dc0a Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 22 Apr 2014 21:39:13 +0530 Subject: [PATCH 3/6] added GITLAB_SIGNIN setting to enable or disable standard login form --- Changelog.md | 1 + README.md | 1 + assets/config/gitlabhq/gitlab.yml | 2 +- assets/init | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 79c2a486..0397a1a6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,7 @@ # Changelog **latest** +- added GITLAB_SIGNIN setting to enable or disable standard login form - upgraded to gitlab-ce version 6.8.0 - added support for linking with redis container. - use sameersbn/ubuntu as the base docker image diff --git a/README.md b/README.md index 2190a0e4..34ea5ad8 100644 --- a/README.md +++ b/README.md @@ -452,6 +452,7 @@ Below is the complete list of available options that can be used to customize yo - **GITLAB_EMAIL**: The email address for the GitLab server. Defaults to gitlab@localhost. - **GITLAB_SUPPORT**: The support email address for the GitLab server. Defaults to support@localhost. - **GITLAB_SIGNUP**: Enable or disable user signups. Default is false. +- **GITLAB_SIGNIN**: If set to false, standard login form won't be shown on the sign-in page. Default is true. - **GITLAB_PROJECTS_LIMIT**: Set default projects limit. Defaults to 10. - **GITLAB_BACKUPS**: Setup cron job to automatic backups. Possible values disable, daily or monthly. Disabled by default - **GITLAB_BACKUP_EXPIRY**: Configure how long to keep backups before they are deleted. By default when automated backups are disabled backups are kept forever (0 seconds), else the backups expire in 7 days (604800 seconds). diff --git a/assets/config/gitlabhq/gitlab.yml b/assets/config/gitlabhq/gitlab.yml index cc911dd9..1f27ae98 100644 --- a/assets/config/gitlabhq/gitlab.yml +++ b/assets/config/gitlabhq/gitlab.yml @@ -58,7 +58,7 @@ production: &base signup_enabled: {{GITLAB_SIGNUP}} # # default: true - If set to false, standard login form won't be shown on the sign-in page - # signin_enabled: false + signin_enabled: {{GITLAB_SIGNIN}} # Restrict setting visibility levels for non-admin users. diff --git a/assets/init b/assets/init index 8ba7c6ee..3d315f01 100755 --- a/assets/init +++ b/assets/init @@ -7,6 +7,7 @@ GITLAB_HTTPS=${GITLAB_HTTPS:-false} GITLAB_EMAIL=${GITLAB_EMAIL:-gitlab@localhost} GITLAB_SUPPORT=${GITLAB_SUPPORT:-support@localhost} GITLAB_SIGNUP=${GITLAB_SIGNUP:-false} +GITLAB_SIGNIN=${GITLAB_SIGNIN:-true} GITLAB_PROJECTS_LIMIT=${GITLAB_PROJECTS_LIMIT:-10} GITLAB_BACKUPS=${GITLAB_BACKUPS:-disable} @@ -189,6 +190,7 @@ sudo -u git -H sed 's/{{GITLAB_SHELL_SSH_PORT}}/'"${GITLAB_SHELL_SSH_PORT}"'/' - # configure gitlab signup configuration sudo -u git -H sed 's/{{GITLAB_SIGNUP}}/'"${GITLAB_SIGNUP}"'/' -i /home/git/gitlab/config/gitlab.yml +sudo -u git -H sed 's/{{GITLAB_SIGNIN}}/'"${GITLAB_SIGNIN}"'/' -i /home/git/gitlab/config/gitlab.yml # configure gitlab default_projects_limit sudo -u git -H sed 's/{{GITLAB_PROJECTS_LIMIT}}/'"${GITLAB_PROJECTS_LIMIT}"'/' -i /home/git/gitlab/config/gitlab.yml From 7ed1cc8403d125fd93c835301061dbf67db65a88 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 22 Apr 2014 21:52:54 +0530 Subject: [PATCH 4/6] Changelog: update version to 6.8.0 --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 0397a1a6..8db0b5ba 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,6 @@ # Changelog -**latest** +**6.8.0** - added GITLAB_SIGNIN setting to enable or disable standard login form - upgraded to gitlab-ce version 6.8.0 - added support for linking with redis container. From b91c930e6563db41b82471b2d468dba0afdd8639 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 22 Apr 2014 22:08:17 +0530 Subject: [PATCH 5/6] fix permissions on gitlab-satellites directory --- assets/init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/init b/assets/init index 3d315f01..39c85764 100755 --- a/assets/init +++ b/assets/init @@ -266,7 +266,7 @@ chown git:git /home/git/data/repositories # create the satellites directory and make sure it has the right permissions sudo -u git -H mkdir -p /home/git/data/gitlab-satellites/ -sudo chmod ug+rwX,o-rwx /home/git/data/gitlab-satellites/ +sudo chmod u+rwx,g+rx,o-rwx /home/git/data/gitlab-satellites/ sudo chmod ug-s /home/git/data/gitlab-satellites/ find /home/git/data/gitlab-satellites/ -type d -print0 | sudo xargs -0 chmod g+s chown git:git /home/git/data/gitlab-satellites From e11ef261fe9c10560d565da943ef69fffaef7da1 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 22 Apr 2014 22:08:33 +0530 Subject: [PATCH 6/6] upgrade to gitlab-shell 1.9.3 --- Changelog.md | 1 + assets/setup/install | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 8db0b5ba..ad5a3c70 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,7 @@ # Changelog **6.8.0** +- upgrade to gitlab-shell 1.9.3 - added GITLAB_SIGNIN setting to enable or disable standard login form - upgraded to gitlab-ce version 6.8.0 - added support for linking with redis container. diff --git a/assets/setup/install b/assets/setup/install index 1640c778..62d1e198 100755 --- a/assets/setup/install +++ b/assets/setup/install @@ -2,7 +2,7 @@ set -e GITLAB_VERSION=6.8.0 -SHELL_VERSION=1.9.1 +SHELL_VERSION=1.9.3 # add git user adduser --disabled-login --gecos 'GitLab' git