Download as
Browse Code »

Commit 1d504c1b74683e1a76ac1ca30bdaf183a5e4e2f0

Authored by David Silva
1 parent a5944626
Exists in gitlab-8.x

Bumps gitlab release to 8.5-15 

  - Change owner and permissions to gitlab-shell files.
  - Add relative url do gitlab-workhorse
Showing 1 changed file with 3 additions and 11 deletions   Show diff stats
src/pkg-rpm/gitlab/gitlab.spec
  Diff comments   View file @1d504c1
... ... @@ -4,15 +4,14 @@
4 4  
5 5 Name: gitlab
6 6 Version: 8.5
7   -Release: 13
  7 +Release: 15
8 8 Summary: Software Development Platform
9 9 Group: Development/Tools
10 10 License: Expat
11 11 URL: https://beta.softwarepublico.gov.br/gitlab/softwarepublico/gitlab
12 12 Source0: %{name}-%{version}.tar.gz
13   -BuildRequires: rh-ruby22, gitlab-deps >= 8.5, nodejs010, gitlab-shell, gitlab-workhorse
  13 +BuildRequires: rh-ruby22, rh-ruby22-rubygem-rake, gitlab-deps >= 8.5, nodejs010, gitlab-shell, gitlab-workhorse
14 14 Requires: gitlab-shell >= 2.6.10, git, gitlab-workhorse, gitlab-deps >= 8.5, nodejs010
15   -Requires: rh-ruby22-rubygem-rake
16 15  
17 16 %description
18 17 GitLab
... ... @@ -98,11 +97,11 @@ cp %{buildroot}/%{_gitlablibdir}/gitlab/lib/support/init.d/gitlab.default.exampl
98 97  
99 98 sed -i 's|gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse && pwd)|gitlab_workhorse_dir="/usr/local/bin/"|' %{buildroot}/%{_sysconfdir}/default/gitlab
100 99 sed -i 's|app_root="/home/$app_user/gitlab"|app_root="/usr/lib/gitlab"|' %{buildroot}/%{_sysconfdir}/default/gitlab
  100 +sed -i 's|127.0.0.1:8080|127.0.0.1:8080/gitlab|' %{buildroot}/%{_sysconfdir}/default/gitlab
101 101  
102 102 install -d %{buildroot}/var/log/gitlab/
103 103 install -d %{buildroot}/var/log/gitlab/repositories
104 104 install -d %{buildroot}/%{_sharedstatedir}/gitlab/uploads
105   -install -d %{buildroot}/%{_sharedstatedir}/gitlab/tmp
106 105 install -d -m ug+rwX,o-rwx %{buildroot}/%{_sharedstatedir}/gitlab-shell/
107 106 install -d %{buildroot}/%{_sharedstatedir}/gitlab-shell/repositories
108 107 install -d %{buildroot}/%{_sharedstatedir}/gitlab-assets/
... ... @@ -111,7 +110,6 @@ install -d %{buildroot}/%{_sysconfdir}/gitlab-shell/
111 110  
112 111 ln -s /var/log/gitlab %{buildroot}/%{_gitlablibdir}/gitlab/log
113 112 ln -s %{_sharedstatedir}/gitlab/uploads %{buildroot}/%{_gitlablibdir}/gitlab/public/uploads
114   -ln -s %{_sharedstatedir}/gitlab/tmp %{buildroot}/%{_gitlablibdir}/gitlab/tmp
115 113 ln -s %{_sharedstatedir}/gitlab-assets %{buildroot}/%{_gitlablibdir}/gitlab/public/assets
116 114  
117 115 %post
... ... @@ -161,12 +159,6 @@ sed -i "s|# ENV\['RAILS_RELATIVE_URL_ROOT']|ENV\['RAILS_RELATIVE_URL_ROOT']|" %{
161 159 sed -i 's|gitlab_url: "http://localhost:8080/"|gitlab_url: "http://localhost:8080/gitlab"|' %{_gitlablibdir}/gitlab-shell/config.yml
162 160 ################################################
163 161  
164   -## Create root admin
165   -sudo -u git env %{rh_path} %{ld_library_path} bundle exec rake db:migrate RAILS_ENV=production
166   -
167   -## Create root admin
168   -sudo -u git env %{rh_path} %{ld_library_path} bundle exec rake db:seed_fu RAILS_ENV=production
169   -
170 162 %preun
171 163 systemctl stop gitlab
172 164 systemctl disable gitlab
... ...