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

[Sven-Hendrik Haase]

    Date: Saturday, May 7, 2016 @ 19:14:28
  Author: svenstaro
Revision: 174214

upgpkg: gitlab 8.7.3-4

Symlink secrets.yml

Modified:
  gitlab/trunk/PKGBUILD
  gitlab/trunk/gitlab.install

----------------+
 PKGBUILD       |    5 ++++-
 gitlab.install |    3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-07 17:12:30 UTC (rev 174213)
+++ PKGBUILD	2016-05-07 17:14:28 UTC (rev 174214)
@@ -8,7 +8,7 @@
 
 pkgname=gitlab
 pkgver=8.7.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Project management and code hosting application"
 arch=('i686' 'x86_64')
 url="https://gitlab.com/gitlab-org/gitlab-ce/tree/master#README"
@@ -166,6 +166,9 @@
   # Install database symlink
   ln -fs "${_etcdir}/database.yml" "${pkgdir}${_datadir}/config/database.yml"
 
+  # Install secrets symlink
+  ln -fs "${_etcdir}/secrets.yml" "${pkgdir}${_datadir}/config/secrets.yml"
+
   # Install license and help files
   mv README.md MAINTENANCE.md CONTRIBUTING.md CHANGELOG config/*.{example,mysql,postgresql} "${pkgdir}/usr/share/doc/${pkgname}"
   install -D "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"

Modified: gitlab.install
===================================================================
--- gitlab.install	2016-05-07 17:12:30 UTC (rev 174213)
+++ gitlab.install	2016-05-07 17:14:28 UTC (rev 174214)
@@ -1,10 +1,11 @@
 post_install() {
     systemd-tmpfiles --create gitlab.conf
 
+    echo "Put a secret bytestring to /etc/webapps/gitlab/secret"
+    echo "Copy /usr/share/doc/gitlab/secrets.yml.example to /etc/webapps/gitlab/secrets.yml and configure it"
     echo "Copy a database example config from /usr/share/doc/gitlab/ to /etc/webapps/gitlab/database.yml and configure it"
     echo "Setup the database:"
     echo "# su - gitlab -s /bin/sh -c \"cd '/usr/share/webapps/gitlab'; bundle-2.1 exec rake gitlab:setup RAILS_ENV=production\""
-    echo "Put a secret bytestring to /etc/webapps/gitlab/secret"
     echo "Finally run the following commands to check your installation:"
     echo "# su - gitlab -s /bin/sh -c \"cd '/usr/share/webapps/gitlab'; bundle-2.1 exec rake gitlab:env_info RAILS_ENV=production\""
     echo "# su - gitlab -s /bin/sh -c \"cd '/usr/share/webapps/gitlab'; bundle-2.1 exec rake gitlab:check RAILS_ENV=production\""