Merge pull request #273 from christianhueserhzdr/272-make-gitlab-db-port-configurable-in-role-gitlab

Make GitLab DB port configurable in GitLab config template

Author: tobiashuste

roles/gitlab/README.md

@@ -208,7 +208,7 @@ gitlab_feature_flags:
   - name: "chatops"
     enabled: true
   - name: "webauthn"
-    enabled: false  
+    enabled: false
 ```
 
 #### Mattermost only use case
@@ -359,6 +359,14 @@ Set IP Address of PostgreSQL Database instance:
 gitlab_postgresql_db_host: '127.0.0.1'
 ```
 
+#### Port of External PostgreSQL Database Instance
+
+Set port of PostgreSQL database instance, if port other than `5432` is used:
+
+```yaml
+gitlab_postgresql_db_port: 5432
+```
+
 #### Password for External PostgreSQL Database Instance
 
 Set password of PostgreSQL Database instance:

roles/gitlab/defaults/main.yml

@@ -66,6 +66,8 @@ gitlab_gitaly_instance_port: "8075"
 gitlab_use_internal_postgresql: "true"
 # External PostgreSQL database host IP / domain
 gitlab_postgresql_db_host: "127.0.0.1"
+# External PostgreSQL database port
+gitlab_postgresql_db_port: 5432
 # External PostgreSQL database password
 gitlab_postgresql_db_password: "changeme"
 

roles/gitlab/templates/gitlab.rb.j2

@@ -54,6 +54,7 @@ postgresql['enable'] = false
 gitlab_rails['db_adapter'] = 'postgresql'
 gitlab_rails['db_encoding'] = 'unicode'
 gitlab_rails['db_host'] = "{{ gitlab_postgresql_db_host }}"
+gitlab_rails['db_port'] = {{ gitlab_postgresql_db_port }}
 gitlab_rails['db_password'] = "{{ gitlab_postgresql_db_password }}"
 {% endif %}