Download as
Browse Code »

Commit 34041b5f16fa5da3781470aa80e5d8a0c1cff890

Authored by Lucas Kanashiro
1 parent f2c28e31
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Gitlab: add symbolic link to public/uploads and add avatar patch 

Signed-off-by: Athos Ribeiro <athoscribeiro@gmail.com>
Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Showing 1 changed file with 4 additions and 1 deletions   Show diff stats
specs/gitlab/gitlab.spec
  Diff comments   View file @34041b5
@@ -6,6 +6,7 @@ Group: Development/Tools @@ -6,6 +6,7 @@ Group: Development/Tools
6 License: Expat 6 License: Expat
7 URL: https://beta.softwarepublico.gov.br/gitlab/softwarepublico/gitlab 7 URL: https://beta.softwarepublico.gov.br/gitlab/softwarepublico/gitlab
8 Source0: %{name}-%{version}.tar.gz 8 Source0: %{name}-%{version}.tar.gz
  9 +Patch0: avatar_url.patch
9 BuildArch: noarch 10 BuildArch: noarch
10 BuildRequires: gitlab-deps 11 BuildRequires: gitlab-deps
11 Requires: gitlab-deps, gitlab-shell, git 12 Requires: gitlab-deps, gitlab-shell, git
@@ -15,7 +16,7 @@ GitLab @@ -15,7 +16,7 @@ GitLab
15 16
16 %prep 17 %prep
17 %setup -q 18 %setup -q
18 -#%patch0 -p 1 19 +%patch0 -p 1
19 20
20 %build 21 %build
21 cat > config/gitlab.yml <<EOF 22 cat > config/gitlab.yml <<EOF
@@ -97,6 +98,7 @@ ln -s /var/lib/gitlab/tmp %{buildroot}/usr/lib/gitlab/tmp @@ -97,6 +98,7 @@ ln -s /var/lib/gitlab/tmp %{buildroot}/usr/lib/gitlab/tmp
97 ln -s /var/lib/gitlab/.gitlab_shell_secret %{buildroot}/usr/lib/gitlab/.gitlab_shell_secret 98 ln -s /var/lib/gitlab/.gitlab_shell_secret %{buildroot}/usr/lib/gitlab/.gitlab_shell_secret
98 ln -s /var/lib/gitlab/.secret %{buildroot}/usr/lib/gitlab/.secret 99 ln -s /var/lib/gitlab/.secret %{buildroot}/usr/lib/gitlab/.secret
99 ln -s /var/lib/gitlab-assets %{buildroot}/usr/lib/gitlab/public/assets 100 ln -s /var/lib/gitlab-assets %{buildroot}/usr/lib/gitlab/public/assets
  101 +ln -s /var/lib/gitlab-uploads %{buildroot}/usr/lib/gitlab/public/uploads
100 102
101 %post 103 %post
102 groupadd git || true 104 groupadd git || true
@@ -114,6 +116,7 @@ mkdir -p /var/lib/gitlab/backups @@ -114,6 +116,7 @@ mkdir -p /var/lib/gitlab/backups
114 mkdir -p /var/lib/gitlab/repositories 116 mkdir -p /var/lib/gitlab/repositories
115 mkdir -p /var/lib/gitlab/satellites 117 mkdir -p /var/lib/gitlab/satellites
116 mkdir -p /var/lib/gitlab/tmp 118 mkdir -p /var/lib/gitlab/tmp
  119 +mkdir -p /var/lib/gitlab-uploads
117 touch /var/lib/gitlab/.gitconfig 120 touch /var/lib/gitlab/.gitconfig
118 ln -s /var/lib/gitlab/.gitconfig /usr/lib/gitlab/.gitconfig 121 ln -s /var/lib/gitlab/.gitconfig /usr/lib/gitlab/.gitconfig
119 chown -R git:git /var/lib/gitlab 122 chown -R git:git /var/lib/gitlab