From a9dd6b65ece4018165cd5999d80925a58a5ac852 Mon Sep 17 00:00:00 2001 From: Salt Date: Sun, 26 Apr 2020 03:56:04 -0500 Subject: [PATCH] Update GitLab config --- roles/gitlab/files/gitlab.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/roles/gitlab/files/gitlab.yml b/roles/gitlab/files/gitlab.yml index f538053..177d683 100644 --- a/roles/gitlab/files/gitlab.yml +++ b/roles/gitlab/files/gitlab.yml @@ -31,7 +31,7 @@ production: &base gitlab: ## Web server settings (note: host is the FQDN, do not include http://) host: localhost - port: 80 # Set to 443 if using HTTPS, see installation.md#using-https for additional HTTPS configuration details + port: 8086 # Set to 443 if using HTTPS, see installation.md#using-https for additional HTTPS configuration details https: false # Set to true if using HTTPS, see installation.md#using-https for additional HTTPS configuration details # The maximum time unicorn/puma can spend on the request. This needs to be smaller than the worker timeout. # Default is 95% of the worker timeout @@ -94,19 +94,19 @@ production: &base # Uncomment and set to false if you need to disable email sending from GitLab (default: true) # email_enabled: true # Email address used in the "From" field in mails sent by GitLab - email_from: example@example.com + email_from: git@9iron.club email_display_name: GitLab - email_reply_to: noreply@example.com + email_reply_to: noreply@9iron.club email_subject_suffix: '' email_smime: # Uncomment and set to true if you need to enable email S/MIME signing (default: false) # enabled: false # S/MIME private key file in PEM format, unencrypted # Default is '.gitlab_smime_key' relative to Rails.root (i.e. root of the GitLab app). - # key_file: /home/git/gitlab/.gitlab_smime_key + # key_file: /var/gitlab/gitlab/.gitlab_smime_key # S/MIME public certificate key in PEM format, will be attached to signed messages # Default is '.gitlab_smime_cert' relative to Rails.root (i.e. root of the GitLab app). - # cert_file: /home/git/gitlab/.gitlab_smime_cert + # cert_file: /var/gitlab/gitlab/.gitlab_smime_cert # Email server smtp settings are in config/initializers/smtp_settings.rb.sample @@ -301,7 +301,7 @@ production: &base ## Dependency Proxy dependency_proxy: - enabled: true + enabled: false # The location where build packages are stored (default: shared/dependency_proxy). # storage_path: shared/dependency_proxy object_store: @@ -322,7 +322,7 @@ production: &base ## Terraform state terraform_state: - enabled: true + enabled: false # The location where Terraform state files are stored (default: shared/terraform_state). # storage_path: shared/terraform_state object_store: @@ -357,7 +357,7 @@ production: &base # File that contains the shared secret key for verifying access for gitlab-pages. # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_pages_secret + # secret_file: /var/gitlab/gitlab/.gitlab_pages_secret ## Mattermost ## For enabling Add to Mattermost button @@ -960,7 +960,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. - client_path: /home/git/gitaly + client_path: /var/gitlab/gitaly # Default Gitaly authentication token. Can be overridden per storage. Can # be left blank when Gitaly is running locally on a Unix socket, which # is the normal way to deploy Gitaly. @@ -978,8 +978,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: - path: /home/git/repositories/ - gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). + path: /var/gitlab/repositories/ + gitaly_address: unix:/var/gitlab/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings @@ -1025,12 +1025,12 @@ production: &base ## GitLab Shell settings gitlab_shell: - path: /home/git/gitlab-shell/ - authorized_keys_file: /home/git/.ssh/authorized_keys + path: /var/gitlab/gitlab-shell/ + authorized_keys_file: /var/gitlab/.ssh/authorized_keys # File that contains the secret key for verifying access for gitlab-shell. # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_shell_secret + # secret_file: /var/gitlab/gitlab/.gitlab_shell_secret # Git over HTTP upload_pack: true @@ -1045,11 +1045,11 @@ production: &base workhorse: # File that contains the secret key for verifying access for gitlab-workhorse. # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_workhorse_secret + # secret_file: /var/gitlab/gitlab/.gitlab_workhorse_secret ## GitLab Elasticsearch settings elasticsearch: - indexer_path: /home/git/gitlab-elasticsearch-indexer/ + indexer_path: /var/gitlab/gitlab-elasticsearch-indexer/ ## Git settings # CAUTION!