Skip to content

Commit 77558c1

Browse files
committed
Sync config v14.8.0 : Remove deprecated config SSL_SELF_CERT
This is imported from upstream. See corresponding merge requests: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78078 https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4690 https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/602
1 parent c5527a3 commit 77558c1

File tree

10 files changed

+15
-22
lines changed

10 files changed

+15
-22
lines changed

README.md

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -483,13 +483,14 @@ Great! we are now just one step away from having our application secured.
483483

484484
##### Enabling HTTPS support
485485

486-
HTTPS support can be enabled by setting the `GITLAB_HTTPS` option to `true`. Additionally, when using self-signed SSL certificates you need to the set `SSL_SELF_SIGNED` option to `true` as well. Assuming we are using self-signed certificates
486+
HTTPS support can be enabled by setting the `GITLAB_HTTPS` option to `true`.
487+
Since corresponding setting `self_signed_cert` was removed in the gitlab-shell 13.26.0 release, the option `SSL_SELF_SIGNED`, that was used to indicate to use a self-signed certificate, is not used anymore. You don't need to set this option even if you're using a self-signed certificate.
487488

488489
```bash
489490
docker run --name gitlab -d \
490491
--publish 10022:22 --publish 10080:80 --publish 10443:443 \
491492
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
492-
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
493+
--env 'GITLAB_HTTPS=true' \
493494
--volume /srv/docker/gitlab/gitlab:/home/git/data \
494495
sameersbn/gitlab:15.5.0
495496
```
@@ -504,7 +505,7 @@ With `NGINX_HSTS_MAXAGE` you can configure that value. The default value is `315
504505

505506
```bash
506507
docker run --name gitlab -d \
507-
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
508+
--env 'GITLAB_HTTPS=true' \
508509
--env 'NGINX_HSTS_MAXAGE=2592000' \
509510
--volume /srv/docker/gitlab/gitlab:/home/git/data \
510511
sameersbn/gitlab:15.5.0
@@ -516,7 +517,7 @@ If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
516517

517518
Load balancers like nginx/haproxy/hipache talk to backend applications over plain http and as such the installation of ssl keys and certificates are not required and should **NOT** be installed in the container. The SSL configuration has to instead be done at the load balancer.
518519

519-
However, when using a load balancer you **MUST** set `GITLAB_HTTPS` to `true`. Additionally you will need to set the `SSL_SELF_SIGNED` option to `true` if self signed SSL certificates are in use.
520+
However, when using a load balancer you **MUST** set `GITLAB_HTTPS` to `true`.
520521

521522
With this in place, you should configure the load balancer to support handling of https requests. But that is out of the scope of this document. Please refer to [Using SSL/HTTPS with HAProxy](http://seanmcgary.com/posts/using-sslhttps-with-haproxy) for information on the subject.
522523

@@ -528,12 +529,11 @@ In summation, when using a load balancer, the docker command would look for the
528529
docker run --name gitlab -d \
529530
--publish 10022:22 --publish 10080:80 \
530531
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
531-
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
532+
--env 'GITLAB_HTTPS=true' \
532533
--volume /srv/docker/gitlab/gitlab:/home/git/data \
533534
sameersbn/gitlab:15.5.0
534535
```
535536

536-
Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
537537

538538
In case GitLab responds to any kind of POST request (login, OAUTH, changing settings etc.) with a 422 HTTP Error, consider adding this to your reverse proxy configuration:
539539

@@ -1594,10 +1594,6 @@ The value of the `worker-src` directive in the `Content-Security-Policy` header.
15941594

15951595
The value of the `report-uri` directive in the `Content-Security-Policy` header
15961596

1597-
##### `SSL_SELF_SIGNED`
1598-
1599-
Set to `true` when using self signed ssl certificates. `false` by default.
1600-
16011597
##### `SSL_CERTIFICATE_PATH`
16021598

16031599
Location of the ssl certificate. Defaults to `/home/git/data/certs/gitlab.crt`

assets/runtime/config/gitlab-shell/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ http_settings:
2626
# password: somepass
2727
# ca_file: /etc/ssl/cert.pem
2828
# ca_path: /etc/pki/tls/certs
29-
self_signed_cert: {{SSL_SELF_SIGNED}}
29+
#
3030

3131
# File used as authorized_keys for gitlab user
3232
auth_file: "{{GITLAB_HOME}}/.ssh/authorized_keys"

assets/runtime/env-defaults

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,10 @@ GITLAB_REGISTRY_ISSUER=${GITLAB_REGISTRY_ISSUER:-gitlab-issuer}
272272
GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=${GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES:-false}
273273

274274
## SSL
275-
SSL_SELF_SIGNED=${SSL_SELF_SIGNED:-false}
275+
### removed
276+
if [ -v SSL_SELF_SIGNED ]; then
277+
echo "The configuration parameter SSL_SELF_SIGNED is removed and not used anymore."
278+
fi
276279
SSL_CERTIFICATE_PATH=${SSL_CERTIFICATE_PATH:-$GITLAB_DATA_DIR/certs/gitlab.crt}
277280
SSL_KEY_PATH=${SSL_KEY_PATH:-$GITLAB_DATA_DIR/certs/gitlab.key}
278281
SSL_DHPARAM_PATH=${SSL_DHPARAM_PATH:-$GITLAB_DATA_DIR/certs/dhparam.pem}

assets/runtime/functions

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1898,7 +1898,6 @@ configure_gitlab_shell() {
18981898
GITLAB_HOME \
18991899
GITLAB_LOG_DIR \
19001900
GITLAB_SHELL_INSTALL_DIR \
1901-
SSL_SELF_SIGNED \
19021901
REDIS_HOST \
19031902
REDIS_PORT \
19041903
REDIS_DB_NUMBER

contrib/docker-swarm/docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ services:
5252
- GITLAB_TIMEZONE=Kolkata
5353

5454
- GITLAB_HTTPS=false
55-
- SSL_SELF_SIGNED=false
5655

5756
- GITLAB_HOST=localhost
5857
- GITLAB_PORT=10080

docker-compose.swarm.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ services:
114114
- GITLAB_TIMEZONE=Kolkata
115115

116116
- GITLAB_HTTPS=true
117-
- SSL_SELF_SIGNED=false
118117

119118
- GITLAB_HOST=${GITLAB_HOST?Variable not set}
120119
- GITLAB_PORT=443

docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ services:
5454
- GITLAB_TIMEZONE=Kolkata
5555

5656
- GITLAB_HTTPS=false
57-
- SSL_SELF_SIGNED=false
5857

5958
- GITLAB_HOST=localhost
6059
- GITLAB_PORT=10080

docs/docker-compose-keycloak.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ services:
4848
- GITLAB_TIMEZONE=Kolkata
4949

5050
- GITLAB_HTTPS=false
51-
- SSL_SELF_SIGNED=false
5251

5352
- GITLAB_HOST='<your-ip-address>'
5453
- GITLAB_PORT=10080

docs/docker-compose-registry.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ services:
4949
- REDIS_PORT=6379
5050

5151
- GITLAB_HTTPS=false
52-
- SSL_SELF_SIGNED=false
5352

5453
- GITLAB_HOST=gitlab.example.com
5554
- GITLAB_PORT=80

docs/s3_compatible_storage.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ This is an extend of AWS Remote Backups.
77
As explained in [doc.gitlab.com](https://docs.gitlab.com/ce/raketasks/backup_restore.html#upload-backups-to-remote-cloud-storage), it uses [Fog library](http://fog.io) and the module fog-aws. More details on [s3 supported parameters](https://github.com/fog/fog-aws/blob/master/lib/fog/aws/storage.rb)
88

99

10+
- [GitLab Backup to s3 compatible storage](#gitlab-backup-to-s3-compatible-storage)
1011
- [Available Parameters](#available-parameters)
1112
- [Installation](#installation)
12-
- [Maintenance](#maintenance)
13-
- [Creating Backups](#creating-backups)
14-
- [Restoring Backups](#restoring-backups)
13+
- [Docker Compose](#docker-compose)
14+
- [Creating Backups](#creating-backups)
15+
- [Restoring Backups](#restoring-backups)
1516

1617

1718
# Available Parameters
@@ -114,7 +115,6 @@ services:
114115
- TZ=Asia/Kolkata
115116
- GITLAB_TIMEZONE=Kolkata
116117
- GITLAB_HTTPS=false
117-
- SSL_SELF_SIGNED=false
118118
- GITLAB_HOST=localhost
119119
- GITLAB_PORT=10080
120120
- GITLAB_SSH_PORT=10022

0 commit comments

Comments
 (0)