277 Commits

Author SHA1 Message Date
Lewis Marshall
06ecea8855 Make the chown of backup files optional 2018-11-09 09:08:23 +00:00
Maycon Lopes dos Santos
7f24c384fb Added GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD to the templates
GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD description

fix number of args
2018-11-06 19:24:04 -02:00
Niclas Mietz
58333c6118
Merge pull request #1699 from froque/invalid_date
date: invalid date correction
2018-09-22 09:40:31 +02:00
Carl Kittelberger
56b6c4245c
Fix backup config stripping for when AWS & GCS are disabled 2018-09-19 09:18:21 +02:00
Tobias Haber
91e05e4489
Add GITLAB_DEFAULT_THEME 2018-09-01 11:00:01 +02:00
Filipe Roque
4b2ff6da0b correction for parsing dates from backups files,
due to format change in version 9.2

see:
https://docs.gitlab.com/ce/raketasks/backup_restore.html#backup-timestamp
https://github.com/sameersbn/docker-gitlab/issues/1414
https://github.com/sameersbn/docker-gitlab/issues/1042#issuecomment-271522064
2018-08-09 11:35:54 +01:00
Sven Dowideit
474fe9f17b Add Docker Swarm config file, and Swar&compose config file support
Signed-off-by: Sven Dowideit <sven.dowideit@csiro.au>
2018-05-22 14:23:36 +10:00
lucianomores
07094553f0 Fix uploads object storage aws endpoint variable 2018-05-15 11:43:49 -03:00
solidnerd
9543f1297e
Remove duplicated curly bracket 2018-05-01 11:29:19 +02:00
solidnerd
d2f1262dfa
Delete Object Store config when it's not used 2018-05-01 10:57:25 +02:00
solidnerd
0bf46bf73b
Add GITLAB_UPLOADS_OBJECT_STORE_*
Signed-off-by: solidnerd <niclas@mietz.io>
2018-04-29 10:49:51 +02:00
solidnerd
79eb0a7e9a
Add GITLAB_LFS_OBJECT_STORE_*
Signed-off-by: solidnerd <niclas@mietz.io>
2018-04-29 10:49:51 +02:00
solidnerd
fdc26d2dd5
Add GITLAB_ARTIFACTS_OBJECT_STORE_*
Signed-off-by: solidnerd <niclas@mietz.io>
2018-04-29 10:49:51 +02:00
solidnerd
6111c2e375
Add GITLAB_SIDEKIQ_LOG_FORMAT
Signed-off-by: solidnerd <niclas@mietz.io>
2018-04-29 10:49:51 +02:00
solidnerd
ff0e1ce1ce
Fix default upload dir 2018-03-17 11:46:49 +01:00
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
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
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
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
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