[arch-commits] Commit in gitlab/trunk (PKGBUILD configs.patch)

[Anatol Pomozov]

    Date: Thursday, June 11, 2020 @ 18:20:26
  Author: anatolik
Revision: 642097

Disable SMTP and use Postfix by default

Modified:
  gitlab/trunk/PKGBUILD
  gitlab/trunk/configs.patch

---------------+
 PKGBUILD      |    2 +-
 configs.patch |   36 +++++++++++++++++++++++++++++-------
 2 files changed, 30 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-11 18:13:31 UTC (rev 642096)
+++ PKGBUILD	2020-06-11 18:20:26 UTC (rev 642097)
@@ -44,7 +44,7 @@
         ruby27-pop-extra-arg.patch)
 install='gitlab.install'
 sha512sums=('SKIP'
-            '0cecb4a7bdba40961ef17169ff3042da8ffab169786255bf1f1143734efd74daed639ac5de181bf68acb59bc31dbe59a4b632f5be165ccb451c247be6f2d2229'
+            '19c69797d268216e254f82dd9e865a70c8e79039a34b09efba42542b6e59e4d74f546be566ad923f39ed9e873273b7341619efa71ce7689d97e1a72df5677753'
             '9623de113358d3d6e49047f688e272d9394579734ace1bd647497e8717a90784546d27e547a29197a16c80d72ad9f2c79eb65f8edc631deadf2ec90ee86ea44b'
             '5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067'
             '6e6a9be7a3985a20e3140553e95e39b08aa4d13005dd4496eea9d3cac6cc6c223018eb01a0ac496f94606d77d73c18d84c9c230e8869dac87b004b46125d67f7'

Modified: configs.patch
===================================================================
--- configs.patch	2020-06-11 18:13:31 UTC (rev 642096)
+++ configs.patch	2020-06-11 18:20:26 UTC (rev 642097)
@@ -1,4 +1,4 @@
-commit 7702fed7650340a1f9f43663a97b2b627e4acdc1
+commit c9e64ce3e8b077b5c5faa27e42dea441ef5dfd91
 Author: Anatol Pomozov <anatol.pomozov at gmail.com>
 Date:   Tue May 26 00:01:38 2020 -0700
 
@@ -37,7 +37,7 @@
    host: localhost
  
 diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index 9a2e470f852..4296c76cb68 100644
+index 9a2e470f852..eaa3031c56f 100644
 --- a/config/gitlab.yml.example
 +++ b/config/gitlab.yml.example
 @@ -83,7 +83,7 @@ production: &base
@@ -49,7 +49,7 @@
  
      ## Date & Time settings
      # Uncomment and customize if you want to change the default time zone of GitLab application.
-@@ -103,13 +103,13 @@ production: &base
+@@ -103,15 +103,15 @@ production: &base
        # 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).
@@ -64,8 +64,11 @@
 -      # ca_certs_file: /home/git/gitlab/.gitlab_smime_ca_certs
 +      # ca_certs_file: /var/lib/gitlab/.gitlab_smime_ca_certs
  
-     # Email server smtp settings are in config/initializers/smtp_settings.rb.sample
+-    # Email server smtp settings are in config/initializers/smtp_settings.rb.sample
++    # Email server smtp settings are in /etc/webapps/gitlab/smtp_settings.rb
  
+     # default_can_create_group: false  # default: true
+     # username_changing_enabled: false # default: true - User can change their username/namespace
 @@ -157,7 +157,7 @@ production: &base
      ## Repository downloads directory
      # When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory.
@@ -195,7 +198,7 @@
        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/lib/gitlab/repositories/
++        path: /var/lib/gitlab/repositories
 +        gitaly_address: unix:/run/gitlab/gitlab-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.
  
@@ -212,7 +215,7 @@
    gitlab_shell:
 -    path: /home/git/gitlab-shell/
 -    authorized_keys_file: /home/git/.ssh/authorized_keys
-+    path: /usr/share/webapps/gitlab-shell/
++    path: /usr/share/webapps/gitlab-shell
 +    authorized_keys_file: /var/lib/gitlab/.ssh/authorized_keys
  
      # File that contains the secret key for verifying access for gitlab-shell.
@@ -232,10 +235,29 @@
    ## GitLab Elasticsearch settings
    elasticsearch:
 -    indexer_path: /home/git/gitlab-elasticsearch-indexer/
-+    indexer_path: /var/lib/gitlab/elasticsearch-indexer/
++    indexer_path: /var/lib/gitlab/elasticsearch-indexer
  
    ## Git settings
    # CAUTION!
+diff --git a/config/initializers/smtp_settings.rb.sample b/config/initializers/smtp_settings.rb.sample
+index bd37080b1c8..f956e786071 100644
+--- a/config/initializers/smtp_settings.rb.sample
++++ b/config/initializers/smtp_settings.rb.sample
+@@ -1,13 +1,6 @@
+-# To enable smtp email delivery for your GitLab instance do the following:
+-# 1. Rename this file to smtp_settings.rb
+-# 2. Edit settings inside this file
+-# 3. Restart GitLab instance
+-#
+ # For full list of options and their values see http://api.rubyonrails.org/classes/ActionMailer/Base.html
+-#
+-# If you change this file in a Merge Request, please also create a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+ 
+-if Rails.env.production?
++if false # To enable SMTP please replace 'false' with 'Rails.env.production?'
+   Rails.application.config.action_mailer.delivery_method = :smtp
+ 
+   ActionMailer::Base.delivery_method = :smtp
 diff --git a/config/puma.rb.example b/config/puma.rb.example
 index cd7adca157f..9dffc101ae5 100644
 --- a/config/puma.rb.example