[packages/gitlab-ce] simplify db/schema.rb handling

glen glen at pld-linux.org
Sun Aug 21 00:02:49 CEST 2016


commit a1aafd5d6e9d788c15508981522ec1431900cf1f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Aug 20 13:56:45 2016 +0300

    simplify db/schema.rb handling
    
    just move it to /etc and keep symlink in original place

 gitlab-ce.spec | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 418086c..ad5dee7 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -17,7 +17,7 @@
 Summary:	A Web interface to create projects and repositories, manage access and do code reviews
 Name:		gitlab-ce
 Version:	8.10.6
-Release:	0.51
+Release:	0.52
 License:	MIT
 Group:		Applications/WWW
 # md5 deliberately omitted until this package is useful
@@ -217,8 +217,12 @@ move_config() {
 for f in gitlab.yml unicorn.rb database.yml; do
 	move_config %{homedir}/config/$f %{_sysconfdir}/gitlab/$f
 done
+
 touch $RPM_BUILD_ROOT%{_sysconfdir}/gitlab/skip-auto-migrations
 
+# relocate to /etc as it's updated runtime, see 77cff54
+move_config %{homedir}/db/schema.rb %{_sysconfdir}/gitlab/schema.rb
+
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{systemdunitdir},%{systemdtmpfilesdir}} \
 	$RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,httpd/webapps.d}
 
@@ -296,6 +300,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gitlab/database.yml
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gitlab/gitlab.yml
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gitlab/unicorn.rb
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gitlab/schema.rb
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/webapps.d/gitlab.conf
 %ghost %{_sysconfdir}/gitlab/skip-auto-migrations
 /etc/logrotate.d/gitlab.logrotate
@@ -316,16 +321,11 @@ fi
 %dir %attr(755,%{uname},%{gname}) %{homedir}/builds
 %dir %attr(755,%{uname},%{gname}) %{homedir}/config
 %attr(-,%{uname},%{gname}) %{homedir}/config/*
+%{homedir}/db
 %{homedir}/fixtures
 %{homedir}/generator_templates
 %{homedir}/lib
 
-%dir %{homedir}/db
-%attr(-,%{uname},%{gname}) %{homedir}/db/schema.rb
-%{homedir}/db/seeds.rb
-%{homedir}/db/fixtures
-%{homedir}/db/migrate
-
 %dir %{homedir}/public
 %{homedir}/public/ci
 %{homedir}/public/*.*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/2243193cc038df38271c5490b2c308b2882e07c9



More information about the pld-cvs-commit mailing list