156 Commits

Author SHA1 Message Date
Steven Achilles
04bfca3805
Merge pull request #3126 from ysicing/master
feat: Add support for Omniauth JWT login.
2025-06-19 19:56:25 +02:00
ysicing
c742614eef
feat: Add support for Omniauth JWT login 2025-06-18 17:24:45 +08:00
Kazunori Kimura
ac47124a0d Allow setting ActiveRecord encryption secrets
Add environment variable to set entry in secrets.yml related to
active record encryption

- active_record_encryption_primary_key (can be multiple)
- active_record_encryption_deterministic_key (can be multiple)
- active_record_encryption_key_derivation_salt

Reference for '32 characters length' recommendation:
https://gitlab.com/gitlab-org/gitlab/-/blob/v18.0.0-ee/config/initializers/2_secret_token.rb#L78-80

TODO: fix command line usage in documentation
2025-06-17 18:53:25 +09:00
Kazunori Kimura
ba429ab996 Unset default value for GITLAB_MONITORING_IP_WHITELIST
On upstream, expected default value is `127.0.0.1/8`
and it is already listed in corresponding configuration.
`GITLAB_MONITORING_IP_WHITELIST` is used to allow monitoring from hosts other than loopback (localhost).

So just unset default value for it.
If the value is not set, the line specifying this "additional" IP range will be removed.
2024-09-20 23:14:38 +09:00
molnarpe
de8d0d52a9
Update env-defaults
Value for client_auth_method is 'query' in the example, but default value is 'basic' as described in [GitLab OmniAuth OIDC documentation, step 4.](https://docs.gitlab.com/ee/administration/auth/oidc.html).
2024-06-19 15:25:46 +02:00
Molnár Péter
f30613b192 Add support for Omniauth OpenID Connect login. 2024-06-18 21:37:37 +02:00
Yannis Mazzer
5204971ce0 #2420 Handle encrypted_settings_key_base variable to allow restoring backups from gitlab instances not running from this image and using encrypted settings feature. 2024-05-24 20:34:18 +02:00
Kazunori Kimura
05794a2b47 Allow setting feature flags via configuration parameter
- It requires database is set up because
  feature flags are stored to DB (table `application_settings`)
- Add configuration parameter GITLAB_FEATURE_FLAGS_ENABLE_TARGETS
  and GITLAB_FEATURE_FLAGS_DISABLE_TARGETS
- Add ruby script to configure feature flags from command line
  and invoke runtime (from configure_gitlab())
2024-03-24 18:43:51 +09:00
massej
0001125859
Update env-defaults 2023-10-24 08:22:08 -04:00
massej
d11ae7b617
Added missing configuration variable OAUTH_ALLOW_BYPASS_TWO_FACTOR. 2023-10-23 22:17:20 -04:00
Steven Achilles
daae8b70d3
Merge pull request #2841 from massej/patch-1
Added - OAuth2 Generic - missing label and scope variables
2023-10-23 22:45:00 +02:00
Kazunori Kimura
a2dd4e5ed8 Accept multiple hosts for RACK_ATTACK_WHITELIST
see sameersbn/docker-gitlab#2828

The current setup also accepts multiple hosts,
but the syntax is a bit strange.
The leading/trailing double quotes are embedded
in the configuration file itself,
so users should expect double quotes around the string they set.
In other words, when setting two hosts 0.0.0.0 and 1.1.1.1,
you will set the strings 0.0.0.0","1.1.1.1 in the
environment variables. This is not intuitive.

This commit removes double quote around corresponding config
and set backward compatibility fallback process
to surround whole with [], each host with double quote.
Also, validation script (written in ruby) will be executed during configuration.

Example docker-compose.yml
````yaml
services:
  gitlab:
    image: sameersbn/gitlab:latest
    environment:
    - RACK_ATTACK_WHITELIST='["127.0.0.1","0.0.0.0"]'
````

Co-authored-by: Mikhail Khadarenka <chodorenko@mail.ru>
2023-10-20 22:24:22 +09:00
massej
af693c5ecc
Update env-defaults 2023-10-01 13:44:28 -04:00
Kazunori Kimura
255ec9461a Increase default SIDEKIQ_MEMORY_KILLER_MAX_RSS to 2GB
There are many warnings like below
recorded in {GITLAB_LOG_DIR}/supervisord/sidekiq.log.
This can be avoided by simply increasing SIDEKIQ_MEMORY_KILLER_MAX_RSS.

----
{
  "severity": "WARN",
  "time": "[MASKED]",
  "class": "Gitlab::SidekiqDaemon::MemoryKiller",
  "pid": [MASKED],
  "message": "Sidekiq worker RSS out of range",
  "current_rss": 1009636,
  "soft_limit_rss": 1000000,
  "hard_limit_rss": [MASKED],
  "memory_total_kb": [MASKED],
  "reason": "current_rss(1009636) \u003e soft_limit_rss(1000000)",
  "running_jobs": [],
  "retry": 0
}
----

For sameersbn/gitlab, this parameter have been introduced with
following commit on May 21, 2015 and never updated until today:
e4008cc7ab9efd626511af4c43e52e2a9490d612

On upstream, the default setting documentation is updated here:
  https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31682
but it is said "the documentation is outdated" at this time.
I could not find out when the value is increased.

At least, In omnibus-gitlab, this have been introduced in MR 2360
(release 11.10.0+ce.0 / 11.10.0+ee.0)
https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/2360
2023-02-22 04:00:45 +09:00
Ivan Baranov
8b9ca622f9 Tested support for azure_activedirectory_v2 2022-09-05 21:46:20 +09:00
Poppo
7d0739218f fix env default variable 2022-06-24 20:12:32 +02:00
Péter Józsa
4752be956c Allow to configure terraform state feature 2022-04-11 12:13:09 +02:00
Kazunori Kimura
e91d9b5f7c support GITLAB_ISSUE_CLOSING_PATTERN 2022-03-27 07:28:01 +09:00
Kazunori Kimura
a9b4feb77b add NGINX_CUSTOM_GITLAB_SERVER_CONFIG 2022-03-04 22:49:52 +09:00
Kazunori Kimura
4943e1ffc0 replace non-break space with normal space
especially, rails warns when "non-break space" found
in configuration file (such as cable.yml)
2022-02-19 14:02:16 +09:00
Akanoa
e2354ed8aa feat: Add "AWS_SIGNATURE_VERSION" related environment variables 2021-07-30 22:41:31 +00:00
Akanoa
cfa1fe2e28 fix: bad default value 2021-07-30 16:32:24 +00:00
Akanoa
bed4200b02 feat: allow to configure the packages registry from environment variables 2021-07-30 16:32:24 +00:00
G.J.R. Timmer
e194e7d8d0 moved default TIMEZONE variable to env-defaults
Resolve conversation
2021-07-01 19:06:26 +02:00
Sameer Naik
09b8c1c265
Merge pull request #1884 from taomaree/custom_hooks_dir
Add support for GITLAB_SHELL_CUSTOM_HOOKS_DIR
2021-06-23 10:46:02 +05:30
Sameer Naik
6b619f4891
Merge pull request #2311 from sue445/csp_params
Add content_security_policy params
2021-06-23 10:45:20 +05:30
sue445
b820c61f33 Add content_security_policy params 2021-04-18 23:28:28 +09:00
l00v3
9b7536a32e Add LDAP_PREVENT_LDAP_SIGN_IN configuration parameter
Committer: l00v3 <love@localhost.localdomain>
2021-03-12 11:59:03 +01:00
Sameer Naik
ebcd5bac34
Merge pull request #2310 from brunoleon/fix_bitbucket
Set default value for BITBUCKET_URL
2021-03-10 10:30:59 +05:30
3kami3
7197de2f3e Update Puma Worker Killer RAM limits 2021-03-04 00:15:58 +09:00
Bruno Léon
8311b1ee74 Set default value for BITBUCKET_URL
If this value is not set importing repo fails when connecting to
bitbucket.
2021-02-23 08:19:52 +01:00
麦当苗儿
83202cdf6a
added SSL_PROTOCOLS option to change protocols of the nginx (#2304) 2021-02-16 08:21:06 +01:00
sue445
0946fef04c Add GITLAB_PAGES_ARTIFACTS_SERVER_URL 2020-12-02 22:57:46 +01:00
John Regan
b45f86cd9b
Allow setting sshd MaxStartups with env variable (fixes #969) (#1111) 2020-08-24 20:53:24 +02:00
Sebastián Ramírez
6e1ded73b5 Add default for GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES 2020-05-26 20:57:04 +02:00
Thomas Lee
ee50f68990 Add GITLAB_SHELL_CUSTOM_HOOKS_DIR 2020-05-15 10:21:41 +08:00
Sameer Naik
b8503427f6
Merge pull request #2093 from appvia/change-sshd-listen-port
Allow modifying the sshd listen port
2020-05-06 08:33:15 +05:30
GO Sueyoshi
c530f56eeb
Pass parameters of puma_worker_killer to puma config (#2124) 2020-04-10 10:27:58 +02:00
Niclas Mietz
e87f29c2a3
Upgrade to 12.9.0 (#2117)
* Upgrade GitLab CE to 12.9.0

* Update gitlab-shell to 12.0.0

Signed-off-by: solidnerd <niclas@mietz.io>

* Update gitlab-workhorse to 8.25.0

Signed-off-by: solidnerd <niclas@mietz.io>

* Update gitlab-pages to 1.17.0

Signed-off-by: solidnerd <niclas@mietz.io>

* Update gitaly to 12.9.0-rc42

Signed-off-by: solidnerd <niclas@mietz.io>

* feat: replace unicorn with puma as webserver

Signed-off-by: solidnerd <niclas@mietz.io>
2020-04-04 10:08:52 +02:00
Niclas Mietz
67a5fc30b4
Upgrade to 12.8.0 (#2090)
* Upgrade GitLab CE to 12.8.0

* Update gitlab-workhorse to 8.21.0

Signed-off-by: solidnerd <niclas@mietz.io>

* Update gitlab-pages to 1.16.0

Signed-off-by: solidnerd <niclas@mietz.io>

* Update gitaly to 12.8.0

Signed-off-by: solidnerd <niclas@mietz.io>

* fix: gitaly-hooks missing symlink

Signed-off-by: solidnerd <niclas@mietz.io>

* chore(base-image): update base image to 20200219

* fix: unicorn worker limits

Signed-off-by: solidnerd <niclas@mietz.io>

* fix(ci): disable caching

Signed-off-by: solidnerd <niclas@mietz.io>

* feat: add patch support for gitlab during the installation

Signed-off-by: solidnerd <niclas@mietz.io>

* fix: ArgumentError: 'import/{{oauth2_generic_name}}' is not a supported controller name

Closes #2101

Signed-off-by: solidnerd <niclas@mietz.io>

* fix: add fix for upstream gitaly problems during a fresh install

Signed-off-by: solidnerd <niclas@mietz.io>

* chore: update changelog.md
2020-03-29 15:29:09 +02:00
Bart Joris
2ea27eef81
Add Generic OAuth2 provider (#2070)
* Add Generic OAuth2 provider

* Add docs to test Keycloak on a local environment

* Update docs for oauth2_generic
2020-03-12 09:05:21 +01:00
Kashif Saadat
be2d9a870f Allow modifying the sshd listen port 2020-03-02 16:46:22 +00:00
Peter Leitzen
aa10ebcf01 Hide unused envvar DB_COLLATION
MySQL support was removed in https://github.com/sameersbn/docker-gitlab/pull/1961
and PostgreSQL doesn't support it anyway.
2019-10-22 20:16:51 -04:00
pbe-axelor
73cb6392fd Add S/MIME Email Signing (#2009)
* Add S/MIME Email Signing

See https://docs.gitlab.com/ce/administration/smime_signing_email.html

Signed-off-by: Pierre Belloy <p.belloy@axelor.com>

* Remove s/mime email configs if not enabled

Signed-off-by: Pierre Belloy <p.belloy@axelor.com>
2019-09-26 06:58:29 +02:00
Pierre Belloy
97ec6e337a Set Sidekiq default log format to json
This follow gitlab default value.
See https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/32842

Signed-off-by: Pierre Belloy <p.belloy@axelor.com>
2019-09-24 11:36:58 +02:00
GO Sueyoshi
1c7629d5a9 Add prepared_statements to database.yml (#1994)
* Add prepared_statements  to database.yml

Co-Authored-By: Niclas Mietz <github@mietz.io>
2019-09-24 07:50:48 +02:00
sue445
edfe1492e2 Add Sentry configuration to gitlab.yml 2019-09-24 07:07:19 +02:00
Julien Grenier
9d8903a523 Fix Auth0 config (#1964)
Fix Auth0 configuration and Add OAUTH_AUTH0_SCOPE
2019-09-24 07:04:13 +02:00
solidnerd
1a22748ea2 Remove MySQL Support for Versions > 12.1 2019-08-11 19:08:22 +02:00
Bartosz Cisek
be45df494d Add support for AWS S3 signature version
Some 3rd party storage solutions allow upload via S3 protocol but still
use v2 of signature schema. [Fog library used by gitlab](https://docs.gitlab.com/ee/administration/uploads.html#s3-compatible-connection-settings)
allows to override default version 4.
2019-07-13 13:24:12 +02:00