Download as
Browse Code »

Commit b823efe82a8c79f9b12804ce7c9084e3b3d7da08

Authored by Antonio Terceiro
1 parent 5dccf243
Exists in master and in 54 other branches add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, create_institution_bootstrap_modal, design_validation, dev_env_minimal, disable_email_dev, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, prezento, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

gitlab: update from contents in OBS

Showing 1 changed file with 16 additions and 6 deletions   Show diff stats
gitlab/gitlab.spec
  Diff comments   View file @b823efe
1 1 Name: gitlab
2 2 Version: 7.6.2
3   -Release: 9%{?dist}
  3 +Release: 12%{?dist}
4 4 Summary: Software Development Platform
5 5 Group: Development/Tools
6 6 License: Expat
... ... @@ -89,6 +89,7 @@ sed -i 's/\/home\/\git/\/usr\/lib/' %{buildroot}/etc/gitlab/unicorn.rb
89 89  
90 90 mkdir -p %{buildroot}/usr/lib/gitlab
91 91 cp -r app bin config config.ru db doc GITLAB_SHELL_VERSION lib Procfile public Rakefile vendor VERSION %{buildroot}/usr/lib/gitlab/
  92 +rm -rf %{buildroot}/usr/lib/gitlab/public/uploads
92 93 mv %{buildroot}/usr/lib/gitlab/config/initializers/rack_attack.rb.example %{buildroot}/usr/lib/gitlab/config/initializers/rack_attack.rb
93 94 for configfile in gitlab.yml unicorn.rb database.yml; do
94 95 ln -s /etc/gitlab/$configfile %{buildroot}/usr/lib/gitlab/config
... ... @@ -97,20 +98,22 @@ ln -s /var/log/gitlab %{buildroot}/usr/lib/gitlab/log
97 98 ln -s /var/lib/gitlab/tmp %{buildroot}/usr/lib/gitlab/tmp
98 99 ln -s /var/lib/gitlab/.secret %{buildroot}/usr/lib/gitlab/.secret
99 100 ln -s /var/lib/gitlab-assets %{buildroot}/usr/lib/gitlab/public/assets
100   -ln -s /var/lib/gitlab-uploads %{buildroot}/usr/lib/gitlab/public/uploads
  101 +ln -s /var/lib/gitlab/uploads %{buildroot}/usr/lib/gitlab/public/uploads
101 102  
102 103 %post
  104 +
103 105 if [ -x /usr/bin/postgres ]; then
104 106 service postgresql initdb || true
105 107 service postgresql start
106 108 sudo -u postgres createuser --createdb git || true
107 109 fi
  110 +
108 111 mkdir -p /var/log/gitlab
109 112 chown -R git:git /var/log/gitlab
110 113 mkdir -p /var/lib/gitlab/backups
111 114 mkdir -p /var/lib/gitlab/satellites
112 115 mkdir -p /var/lib/gitlab/tmp
113   -mkdir -p /var/lib/gitlab-uploads
  116 +mkdir -p /var/lib/gitlab/uploads
114 117 touch /var/lib/gitlab/.gitconfig
115 118 ln -s /var/lib/gitlab/.gitconfig /usr/lib/gitlab/.gitconfig
116 119 chown -R git:git /var/lib/gitlab
... ... @@ -127,7 +130,13 @@ sudo -u git -H "/usr/bin/git" config --global core.autocrlf "input"
127 130 mkdir -p /var/lib/gitlab-assets
128 131  
129 132 cd /usr/lib/gitlab/
130   -yes yes | sudo -u git bundle exec rake gitlab:setup RAILS_ENV=production
  133 +
  134 +rc=`sudo -u git bundle exec rake db:migrate:status RAILS_ENV=production | wc -l`
  135 +
  136 +if [ $rc -le 1 ];then
  137 + yes yes | sudo -u git bundle exec rake gitlab:setup RAILS_ENV=production
  138 +fi
  139 +
131 140 bundle exec rake assets:precompile RAILS_ENV=production
132 141  
133 142 cp /usr/lib/gitlab/lib/support/init.d/gitlab /etc/init.d/gitlab
... ... @@ -137,8 +146,9 @@ cp /usr/lib/gitlab/lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
137 146 sed -i 's/app_root="\/home\/\$app_user\/gitlab"/app_root="\/usr\/lib\/gitlab"/' /etc/default/gitlab
138 147 sed -i 's/\/home\/\git/\/usr\/lib/' /etc/logrotate.d/gitlab
139 148  
140   -%postun
141   -service gitlab stop
  149 +%preun
  150 +systemctl stop gitlab
  151 +systemctl disable gitlab
142 152  
143 153 %files
144 154 /usr/lib/gitlab
... ...