Skip to content

Commit 24eb6bb

Browse files
Marcin Sedlak-JakubowskiaxilleasereadAsmaa Hassan
committed
Merge branch 'asmaa.hassan-master-patch-f1b5' into 'master'
Removing references of old versions of distribution:deply | omnibus docs See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7557 Merged-by: Marcin Sedlak-Jakubowski <[email protected]> Approved-by: Evan Read <[email protected]> Approved-by: Marcin Sedlak-Jakubowski <[email protected]> Reviewed-by: Evan Read <[email protected]> Co-authored-by: Achilleas Pipinellis <[email protected]> Co-authored-by: Evan Read <[email protected]> Co-authored-by: Asmaa Hassan <[email protected]>
2 parents ba9ca69 + 8072891 commit 24eb6bb

File tree

11 files changed

+17
-106
lines changed

11 files changed

+17
-106
lines changed

doc/installation/index.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ For a complete list of settings, see the [README](../index.md#configuring) file.
4848

4949
### Set up the initial password
5050

51-
> - [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5331) in GitLab 14.0.
52-
5351
By default, a Linux package installation automatically generates a password for the
5452
initial administrator user account (`root`) and stores it to
5553
`/etc/gitlab/initial_root_password` for at least 24 hours. For security reasons,

doc/roles/index.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Documentation on the use of the Redis Roles can be found in [Configuring Redis f
7070

7171
*By default, enables no other services.*
7272

73-
- **redis_replica_role** (`gitlab-ee`, [introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/4168) in GitLab 13.0)
73+
- **redis_replica_role** (`gitlab-ee`)
7474

7575
Enables the Redis service and monitoring
7676

@@ -117,8 +117,6 @@ for configuration steps.
117117

118118
### Monitoring Roles
119119

120-
> - [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/3404) in GitLab 12.1.
121-
122120
Monitoring roles are used to set up monitoring of installations. For additional information, see the [Monitoring documentation](https://docs.gitlab.com/ee/administration/monitoring/prometheus/index.html).
123121

124122
- **monitoring_role** (`gitlab-ce`/`gitlab-ee`)
@@ -137,7 +135,7 @@ Documentation on the usage of the PostgreSQL Roles can be found in [Configuring
137135

138136
*By default, enables no other services.*
139137

140-
- **patroni_role** (`gitlab-ee`, [introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/4851) in GitLab 13.8)
138+
- **patroni_role** (`gitlab-ee`)
141139

142140
Enables the PostgreSQL, patroni, and Consul services on the machine
143141

@@ -157,8 +155,6 @@ Documentation on the usage of the PostgreSQL Roles can be found in [Configuring
157155

158156
### GitLab Pages Roles
159157

160-
> - [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/4740) in GitLab 13.6.
161-
162158
GitLab Pages roles are used to setup and configure GitLab Pages. For additional
163159
information, see the
164160
[GitLab Pages Administration documentation](https://docs.gitlab.com/ee/administration/pages/index.html)
@@ -171,8 +167,6 @@ information, see the
171167

172168
### Sidekiq Roles
173169

174-
> - [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5365) in GitLab 14.1.
175-
176170
Sidekiq roles are used to setup and configure Sidekiq. For additional
177171
information, see the
178172
[Sidekiq Administration documentation](https://docs.gitlab.com/ee/administration/sidekiq/index.html)
@@ -185,8 +179,6 @@ information, see the
185179

186180
### Spamcheck Roles
187181

188-
> - [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5893) in GitLab 14.9.
189-
190182
Spamcheck roles are used to setup and configure Spamcheck services. For additional
191183
information, see the
192184
[Spamcheck documentation](https://docs.gitlab.com/ee/administration/reporting/spamcheck.html)

doc/settings/backups.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ It is not recommended to store your configuration backup in the
2323
same place as your application data backup, see below.
2424

2525
All configuration for Linux package installations is stored in `/etc/gitlab`. To backup your
26-
configuration, just run `sudo gitlab-ctl backup-etc` (introduced in GitLab 12.3). It creates a tar
26+
configuration, just run `sudo gitlab-ctl backup-etc`. It creates a tar
2727
archive in `/etc/gitlab/config_backup/`. Directory and backup files will be
2828
readable only to root.
2929

@@ -68,8 +68,6 @@ Your machines SSH host keys are stored in a separate location at `/etc/ssh/`. Be
6868

6969
### Limit backup lifetime for configuration backups (prune old backups)
7070

71-
> - [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5102) in GitLab 13.12.
72-
7371
GitLab configuration backups can be pruned using the same `backup_keep_time` setting that is
7472
[used for the GitLab application backups](https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#limit-backup-lifetime-for-local-files-prune-old-backups)
7573

doc/settings/configuration.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -709,9 +709,8 @@ cross-site scripting (XSS) attacks. See
709709
[the Mozilla documentation on CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP) for more
710710
details.
711711
712-
GitLab 12.2 added support for
713-
[CSP and nonce-source with inline JavaScript](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src).
714-
It is [not configured by default yet](https://gitlab.com/gitlab-org/gitlab/-/issues/30720).
712+
[CSP and nonce-source with inline JavaScript](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src) is available on GitLab.com.
713+
It is [not configured by default](https://gitlab.com/gitlab-org/gitlab/-/issues/30720) on self-managed.
715714
716715
NOTE:
717716
Improperly configuring the CSP rules could prevent GitLab from working
@@ -746,8 +745,7 @@ To add a CSP:
746745
}
747746
```
748747
749-
[In GitLab 14.9 and later](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80303), secure default values
750-
are used for directives that aren't explicitly configured.
748+
Secure default values are used for directives that aren't explicitly configured.
751749

752750
To unset a CSP directive, set a value of `false`.
753751

doc/settings/database.md

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -178,22 +178,14 @@ After you have these files, enable SSL:
178178

179179
To determine whether SSL is being used by clients, you can run:
180180

181-
In [GitLab 14.2 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/341210):
182-
183181
```shell
184182
sudo gitlab-rails dbconsole --database main
185183
```
186184

187-
In GitLab 14.1 and earlier:
188-
189-
```shell
190-
sudo gitlab-rails dbconsole
191-
```
192-
193185
At startup, you should see a banner as the following:
194186

195187
```plaintext
196-
psql (9.6.5)
188+
psql (13.14)
197189
SSL connection (protocol: TLSv1.2, cipher: ECDHE-RSA-AES256-GCM-SHA384, bits: 256, compression: on)
198190
Type "help" for help.
199191
```
@@ -480,7 +472,7 @@ To upgrade the PostgreSQL version, be sure that:
480472
(or update your database path).
481473
- Check the space available using `sudo df -h`. If the partition where the
482474
database resides doesn't have enough space, pass the argument `--tmp-dir $DIR`
483-
to the command. GitLab 13.3 and above include an available disk space check and aborts
475+
to the command. The upgrade task includes an available disk space check and aborts
484476
the upgrade if the requirements aren't met.
485477
486478
After you confirm that the above checklist is satisfied, you can proceed with
@@ -1009,8 +1001,6 @@ parameters noted in the table below and then run `gitlab-ctl reconfigure`.
10091001

10101002
## Automatic database reindexing
10111003

1012-
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/249662) in GitLab 13.5.
1013-
10141004
WARNING:
10151005
This is an experimental feature that isn't enabled by default.
10161006
@@ -1140,23 +1130,6 @@ bandwidth. For example, at a transfer speed of 30 Mbps, and a database size of
11401130
[PostgreSQL documentation](https://www.postgresql.org/docs/11/pgupgrade.html)
11411131
for more.
11421132
1143-
#### Disabling automatic PostgreSQL upgrades
1144-
1145-
From GitLab 12.1 through GitLab 12.9, GitLab package upgrades try to upgrade
1146-
PostgreSQL to version 10.x. In GitLab 12.10 and later, upgrades of PostgreSQL
1147-
don't happen in an unattended manner when using Geo.
1148-
1149-
Before upgrading to GitLab 12.1 through GitLab 12.9, we strongly recommend
1150-
disabling unattended upgrades of PostgreSQL and manually upgrading PostgreSQL
1151-
separately from upgrading the GitLab package to avoid any unintended downtime.
1152-
1153-
You can disable unattended upgrades of PostgreSQL by running the following on
1154-
all nodes running `postgresql` or `geo-postgresql`:
1155-
1156-
```shell
1157-
sudo touch /etc/gitlab/disable-postgresql-upgrade
1158-
```
1159-
11601133
#### How to upgrade PostgreSQL when using Geo
11611134
11621135
To upgrade PostgreSQL, you will need the name of the replication slot, and the
@@ -1221,24 +1194,10 @@ replication user's password.
12211194
If you need to connect to the PostgreSQL database, you can connect as the
12221195
application user:
12231196

1224-
In [GitLab 14.2 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/341210):
1225-
12261197
```shell
12271198
sudo gitlab-rails dbconsole --database main
12281199
```
12291200

1230-
In GitLab 14.1 and earlier:
1231-
1232-
```shell
1233-
sudo gitlab-rails dbconsole
1234-
```
1235-
1236-
or as a PostgreSQL superuser:
1237-
1238-
```shell
1239-
sudo gitlab-psql -d gitlabhq_production
1240-
```
1241-
12421201
## Troubleshooting
12431202

12441203
### Set `default_transaction_isolation` into `read committed`

doc/settings/environment-variables.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ registry['env'] = {
5252
}
5353
```
5454

55-
GitLab 11.6 and newer will attempt to use HTTP Basic
56-
Authentication when a username and password is included in the proxy
57-
URL. Older GitLab versions will omit the authentication details.
55+
GitLab will attempt to use HTTP Basic Authentication when a username and password is included in the proxy URL.
5856

5957
Proxy settings use the `.` syntax for globing.
6058

doc/settings/gitlab.yml.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Some GitLab features can be customized through
1515
for a Linux package installation, you need to do so with `/etc/gitlab/gitlab.rb`. The
1616
translation works as follows. For a complete list of available options, visit the
1717
[`gitlab.rb.template`](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template).
18-
New installations starting from GitLab 7.6 have
19-
all the options of the template listed in `/etc/gitlab/gitlab.rb` by default.
18+
19+
All the options of the template listed in `/etc/gitlab/gitlab.rb` are avilable by default.
2020

2121
In `gitlab.yml`, you find structure like this:
2222

doc/settings/logs.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,7 @@ logrotate['enable'] = false
144144

145145
### Logrotate `notifempty` setting
146146

147-
Since [GitLab 13.6](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/3820),
148-
the logrotate service runs with a non-configurable default of `notifempty`, resolving
147+
The logrotate service runs with a non-configurable default of `notifempty`, resolving
149148
the following issues:
150149

151150
- Empty logs being rotated unnecessarily, and often many empty logs being stored.

doc/settings/nginx.md

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -440,18 +440,9 @@ web_server['external_users'] = ['www-data']
440440

441441
Make sure you run `sudo gitlab-ctl reconfigure` for the changes to take effect.
442442

443-
NOTE:
444-
If you are running a version older than 8.16.0, you will have to
445-
manually remove the Unicorn service file (`/opt/gitlab/service/unicorn`), if
446-
exists, for reconfigure to succeed.
447-
448443
### Vhost (server block)
449444

450-
NOTE:
451-
GitLab 13.5 changed the default workhorse socket location from `/var/opt/gitlab/gitlab-workhorse/socket` to `/var/opt/gitlab/gitlab-workhorse/sockets/socket`. Please update the following configuration accordingly if upgrading from versions older than 13.5.
452-
453-
Then, in your custom Passenger/NGINX installation, create the following site
454-
configuration file:
445+
In your custom Passenger/NGINX installation, create the following site configuration file:
455446

456447
```plaintext
457448
upstream gitlab-workhorse {
@@ -757,24 +748,6 @@ header with `hide_server_tokens`:
757748
sudo gitlab-ctl hup nginx
758749
```
759750

760-
### `502: Bad Gateway` when SELinux and external NGINX are used
761-
762-
On Linux servers with SELinux enabled, after setting up an external NGINX, the error `502: Bad Gateway` may be observed when accessing the GitLab UI. You can also see the error in NGINX's logs:
763-
764-
```plaintext
765-
connect() to unix:/var/opt/gitlab/gitlab-workhorse/sockets/socket failed (13:Permission denied) while connecting to upstream
766-
```
767-
768-
Select one of the following options to fix:
769-
770-
- Update to GitLab 14.3 or later which contains an [updated SELinux policy](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5569).
771-
- Fetch and update the policy manually:
772-
773-
```shell
774-
wget https://gitlab.com/gitlab-org/omnibus-gitlab/-/raw/a9d6b020f81d18d778fb502c21b2c8f2265cabb4/files/gitlab-selinux/rhel/7/gitlab-13.5.0-gitlab-shell.pp
775-
semodule -i gitlab-13.5.0-gitlab-shell.pp
776-
```
777-
778751
### `Branch 'branch_name' was not found in this project's repository` when Web IDE and external NGINX are used
779752

780753
If you get this error, check your NGINX configuration file if you have a trailing slash in `proxy_pass` and remove it:

doc/settings/smtp.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ gitlab_rails['smtp_ca_file'] = '/path/to/your/cacert.pem'
4646

4747
## SMTP connection pooling
4848

49-
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/230717) in GitLab 13.5.
50-
5149
You can enable SMTP connection pooling with the following setting:
5250

5351
```ruby
@@ -58,8 +56,6 @@ This allows Sidekiq workers to reuse SMTP connections for multiple jobs. The max
5856

5957
## Using encrypted credentials
6058

61-
> - [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6276) in GitLab 14.3.
62-
6359
Instead of storing the SMTP credentials in the configuration files as plain text, you can optionally
6460
use an encrypted file for the SMTP credentials. To use this feature, you first need to enable
6561
[GitLab encrypted configuration](https://docs.gitlab.com/ee/administration/encrypted_configuration.html).

0 commit comments

Comments
 (0)