751 Commits

Author SHA1 Message Date
solidnerd
b4bb8536c7
Sync upstream gitlab.yml
Signed-off-by: solidnerd <niclas@mietz.io>
2018-02-25 12:44:42 +01:00
solidnerd
96e2a8fca6
Add LDAP_LOWERCASE_USERNAMES
Signed-off-by: solidnerd <niclas@mietz.io>
2018-02-25 12:44:42 +01:00
solidnerd
52b669a7a3
Add GITLAB_UPLOADS_STORAGE_PATH and GITLAB_UPLOADS_BASE_DIR 2018-02-25 12:44:29 +01:00
solidnerd
501bd390f6
Fix Typo
Signed-off-by: solidnerd <niclas@mietz.io>
2018-02-25 10:46:52 +01:00
solidnerd
82b3592f23
Remove direct redis integration from gitlab-shell
Signed-off-by: solidnerd <niclas@mietz.io>
2018-02-25 10:46:52 +01:00
solidnerd
5e17cd8a24
Remove rsa1 ssh_host_key
This means that the SSH 1 protocol wouldn’t be supported anymore.

Signed-off-by: solidnerd <niclas@mietz.io>
2018-02-03 09:32:08 +01:00
solidnerd
dbe49107de
Add Kerberos dev libs for omnibus-auth-kerberos package
Signed-off-by: solidnerd <niclas@mietz.io>
2018-01-26 17:25:54 +01:00
solidnerd
81f54f7135
Replace re2 manual install with libre2-dev
Since we are using xenial now. It’s also possible to cleanup this build instruction.

Signed-off-by: solidnerd <niclas@mietz.io>
2018-01-26 17:25:54 +01:00
solidnerd
169ec31ac0
Update gitaly config.toml
Signed-off-by: solidnerd <niclas@mietz.io>
2018-01-24 20:35:00 +01:00
solidnerd
7ae99c01d6
Remove unused redis bin configuration.
Signed-off-by: solidnerd <niclas@mietz.io>
2018-01-24 20:35:00 +01:00
Niclas Mietz
5430452ad3
Merge pull request #1449 from drubin/fix-aws-multi-part-upload
Correct template file for AWS_BACKUP_MULTIPART_CHUNK_SIZE env
2018-01-04 21:15:04 +01:00
Wang Xuerui
29fc2f5a1f Allow running on PaX kernels
`ruby` needs the PaX MPROTECT flag disabled to run on PaX-enabled systems because of JIT. Mark it as such.
2017-12-30 17:57:05 +08:00
David Rubin
14c3225d03 Add AWS_BACKUP_STORAGE_CLASS configuration option 2017-12-29 16:46:58 +01:00
David Rubin
5ea41eb3d6 Add AWS_BACKUP_ENCRYPTION ENV to enable aws backup aes encryption backups
Also refactor the multi part config to match
2017-12-29 16:42:15 +01:00
David Rubin
94d5f687df Remove multipart configs if AWS_BACKUP_MULTIPART_CHUNK_SIZE is not set 2017-12-29 16:16:22 +01:00
David Rubin
a3a23a4bc6 Correct template file for AWS_BACKUP_MULTIPART_CHUNK_SIZE env
Fixes #1293

Correctly setup and configure the template in order to use chunked
upload.
2017-12-26 20:53:06 +01:00
solidnerd
cf29d0676b
Update gitlab.yml to upstream
Signed-off-by: solidnerd <niclas@mietz.io>
2017-12-26 11:20:05 +01:00
solidnerd
1f02a1b54c
Remove GITLAB_TIMEOUT
Signed-off-by: solidnerd <niclas@mietz.io>
2017-12-26 11:20:05 +01:00
solidnerd
c04ee489d9
Remove GITLAB_MAX_OBJECT_SIZE
Signed-off-by: solidnerd <niclas@mietz.io>
2017-12-26 11:20:05 +01:00
solidnerd
8d29eb22af
Remove GITLAB_REPOSITORIES_STORAGES_DEFAULT_STORAGE_TIMEOUT
Signed-off-by: solidnerd <niclas@mietz.io>
2017-12-26 11:20:05 +01:00
solidnerd
91157bca06
Remove GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_RESET_TIME
Signed-off-by: solidnerd <niclas@mietz.io>
2017-12-26 11:20:05 +01:00
solidnerd
7a9d333b2d
Remove GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_WAIT_TIME
Signed-off-by: solidnerd <niclas@mietz.io>
2017-12-26 11:20:04 +01:00
solidnerd
a705e5f03f
Remove GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_COUNT_THRESHOLD
Signed-off-by: solidnerd <niclas@mietz.io>
2017-12-26 11:20:04 +01:00
Niclas Mietz
fd5343dce2
Merge pull request #1190 from yfoelling/master
Fixup for multiple Backups
2017-11-09 17:02:38 +01:00
Bertrand Gouny
cb48a6aff0 ldap ca_file and ssl_version config params 2017-10-30 14:27:33 +01:00
solidnerd
31dee60bec
Update gitaly config.toml
Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-26 23:00:14 +02:00
Niclas Mietz
bddb64b4fc Merge pull request #1355 from LordFPL/patch-2
Add gitaly-ruby & gitlab-shell dir
2017-10-26 22:56:47 +02:00
solidnerd
311dc66915
Update gitlab.yml from upstream
Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-26 21:47:53 +02:00
solidnerd
f765ef06be
Add GITLAB_PAGES_ARTIFACTS_SERVER
Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-26 21:47:53 +02:00
solidnerd
df4d252cc9
Add GITLAB_PAGES_CLIENT_PATH
Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-26 21:47:53 +02:00
solidnerd
c570f1c196
Remove GITALY_ENABLED
Since the last version Gitaly is now the way to go. So I removed this variable from the image.

Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-26 21:47:53 +02:00
solidnerd
3fc8424bba
Use git as installation for gitaly
This commit applys the patch from @fmauNeko .

Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-26 21:47:53 +02:00
solidnerd
e025be725e
Fix gitlab-pages installation
This fixes the installation of gitlab-pages.
Git will be now used to download gitlab-pages and the new make script will be used.
Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-22 19:22:47 +02:00
solidnerd
295ec223e7
Syntax mistake on LDAP_VERIFY_SSL
Deleting quotes on LDAP_VERIFY_SSL

Signed-off-by: solidnerd <niclas@mietz.io>
# Conflicts:
#	assets/runtime/config/gitlabhq/gitlab.yml
2017-10-20 22:06:05 +02:00
BirgerK
bdb4dbd18f fix possible values for ldap-encryption 2017-10-19 23:32:39 +02:00
LordFPL
1cd2d70082 Add LDAP_VERIFY_SSL var (#1367)
* Add LDAP_VERIFY_SSL var

Due to https://about.gitlab.com/2017/09/22/gitlab-10-0-released/#ldap-config-%22verify_certificates%22-defaults-to-secure, this config should be present.

* Update env-defaults

* Update functions

* Update README.md
2017-10-08 12:58:17 +03:00
Niclas Mietz
ad57bec259 Merge pull request #1358 from evenh/clean-history
GitLab CE 10.0.0
2017-10-03 12:42:35 +03:00
Even Holthe
985d57afb9 Add ajv as an explicit dependency
Thanks to @phenomax to pointing this out. Should probably be removed in
the future once it's fixed upstream.

See the following links for more info:
  - https://gitlab.com/gitlab-org/gitlab-ce/issues/38275
  - https://gitlab.com/gitlab-org/gitlab-ce/issues/38050
  - https://github.com/sameersbn/docker-gitlab/issues/1360
2017-10-01 21:33:25 +02:00
LordFPL
90dbcf257d Add gitaly-ruby & gitlab-shell dir
Fix https://github.com/sameersbn/docker-gitlab/issues/1354
2017-09-21 12:16:12 +02:00
Mariusz 'koder' Chwalba
cee6b282ba Increase default memory max to address #1347 2017-09-20 12:57:42 +02:00
Silas Rech
cd97f7ca0e
Fix some whitespace / tab issues 2017-08-24 16:58:26 +02:00
Silas Rech
5c2e00e2ec
Add monitoring keys 2017-08-24 16:50:32 +02:00
Max
b9b56bf6be
Add variables to config functions 2017-08-23 23:08:25 +02:00
Max
1b09ce0bef
Add config vars for the gitaly token & gitlab repository timeout/reset 2017-08-23 22:59:37 +02:00
Max
9c601cf643
Add prometheus client reset to unicorn.rb - https://gitlab.com/gitlab-org/gitlab-ce/blob/9-5-stable/config/unicorn.rb.example#L124 2017-08-22 13:40:19 +02:00
Max
27ed0c7ec5
Change ldap.servers.main.method key to encryption - https://gitlab.com/gitlab-org/gitlab-ce/blob/9-5-stable/config/gitlab.yml.example#L728 2017-08-22 13:38:09 +02:00
Max
50fd3e71f9
Add gitaly.token to gitlab.yml - https://gitlab.com/gitlab-org/gitlab-ce/blob/9-5-stable/config/gitlab.yml.example#L492 2017-08-22 13:37:01 +02:00
Max
dc5c505d1d
add gitaly_adress to repositories.storages in gitlab.yml - https://gitlab.com/gitlab-org/gitlab-ce/blob/9-5-stable/config/gitlab.yml.example#L651 2017-08-22 13:33:44 +02:00
Max
72c5bc9ac3
Add build in monitor settings to gitlab.yml 2017-08-22 13:30:26 +02:00
Max
953d1f3c7a
Add new repository keys to gitlab.yml - https://gitlab.com/gitlab-org/gitlab-ce/blob/9-5-stable/config/gitlab.yml.example#L509 2017-08-22 13:26:38 +02:00