Download as
Browse Code »

Commit 99bf5a7e6afa76385bf2d444ce9d724a63d4d608

Authored by Antonio Terceiro
2 parents 0ee700f9 ce85436c
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

Merge branch 'gitlab_ssh_dir' 

See merge request !1
Showing 2 changed files with 6 additions and 15 deletions   Show diff stats
specs/gitlab/gitlab-shell.spec
  Diff comments   View file @99bf5a7
1 Name: gitlab-shell 1 Name: gitlab-shell
2 Version: 2.4.0 2 Version: 2.4.0
3 -Release: 2%{?dist} 3 +Release: 3%{?dist}
4 Summary: Software Development Platform 4 Summary: Software Development Platform
5 5
6 Group: Development/Tools 6 Group: Development/Tools
@@ -30,7 +30,7 @@ http_settings: @@ -30,7 +30,7 @@ http_settings:
30 # ca_path: /etc/pki/tls/certs 30 # ca_path: /etc/pki/tls/certs
31 self_signed_cert: false 31 self_signed_cert: false
32 32
33 -repos_path: "/var/lib/gitlab/repositories/" 33 +repos_path: "/var/lib/gitlab-shell/repositories/"
34 auth_file: "/var/lib/gitlab-shell/.ssh/authorized_keys" 34 auth_file: "/var/lib/gitlab-shell/.ssh/authorized_keys"
35 35
36 redis: 36 redis:
@@ -59,19 +59,16 @@ cp -r . %{buildroot}/usr/lib/gitlab-shell @@ -59,19 +59,16 @@ cp -r . %{buildroot}/usr/lib/gitlab-shell
59 %post 59 %post
60 groupadd git || true 60 groupadd git || true
61 if ! id git; then 61 if ! id git; then
62 - adduser --system --home-dir /usr/lib/gitlab --no-create-home --gid git git 62 + adduser --system --home-dir /usr/lib/gitlab --gid git git
63 fi 63 fi
64 64
65 mkdir -p /var/log/gitlab-shell 65 mkdir -p /var/log/gitlab-shell
66 mkdir -p /var/lib/gitlab-shell/.ssh 66 mkdir -p /var/lib/gitlab-shell/.ssh
67 -  
68 -ln -s /var/lib/gitlab-shell/.ssh /usr/lib/gitlab/.ssh 67 +mkdir -p /var/lib/gitlab-shell/repositories
69 68
70 chown -R git:git /var/log/gitlab-shell 69 chown -R git:git /var/log/gitlab-shell
71 chown -R git:git /var/lib/gitlab-shell 70 chown -R git:git /var/lib/gitlab-shell
72 71
73 -ln -s /var/lib/gitlab/.gitlab_shell_secret /usr/lib/gitlab-shell/.gitlab_shell_secret  
74 -  
75 sudo -u git -H /usr/lib/gitlab-shell/bin/install 72 sudo -u git -H /usr/lib/gitlab-shell/bin/install
76 73
77 %files 74 %files
specs/gitlab/gitlab.spec
  Diff comments   View file @99bf5a7
1 Name: gitlab 1 Name: gitlab
2 Version: 7.6.2 2 Version: 7.6.2
3 -Release: 8%{?dist} 3 +Release: 9%{?dist}
4 Summary: Software Development Platform 4 Summary: Software Development Platform
5 Group: Development/Tools 5 Group: Development/Tools
6 License: Expat 6 License: Expat
@@ -53,7 +53,7 @@ production: &base @@ -53,7 +53,7 @@ production: &base
53 path: /var/lib/gitlab/backups 53 path: /var/lib/gitlab/backups
54 gitlab_shell: 54 gitlab_shell:
55 path: /usr/lib/gitlab-shell 55 path: /usr/lib/gitlab-shell
56 - repos_path: /var/lib/gitlab/repositories/ 56 + repos_path: /var/lib/gitlab-shell/repositories/
57 hooks_path: /usr/lib/gitlab-shell/hooks/ 57 hooks_path: /usr/lib/gitlab-shell/hooks/
58 # Git over HTTP 58 # Git over HTTP
59 upload_pack: true 59 upload_pack: true
@@ -95,16 +95,11 @@ for configfile in gitlab.yml unicorn.rb database.yml; do @@ -95,16 +95,11 @@ for configfile in gitlab.yml unicorn.rb database.yml; do
95 done 95 done
96 ln -s /var/log/gitlab %{buildroot}/usr/lib/gitlab/log 96 ln -s /var/log/gitlab %{buildroot}/usr/lib/gitlab/log
97 ln -s /var/lib/gitlab/tmp %{buildroot}/usr/lib/gitlab/tmp 97 ln -s /var/lib/gitlab/tmp %{buildroot}/usr/lib/gitlab/tmp
98 -ln -s /var/lib/gitlab/.gitlab_shell_secret %{buildroot}/usr/lib/gitlab/.gitlab_shell_secret  
99 ln -s /var/lib/gitlab/.secret %{buildroot}/usr/lib/gitlab/.secret 98 ln -s /var/lib/gitlab/.secret %{buildroot}/usr/lib/gitlab/.secret
100 ln -s /var/lib/gitlab-assets %{buildroot}/usr/lib/gitlab/public/assets 99 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 ln -s /var/lib/gitlab-uploads %{buildroot}/usr/lib/gitlab/public/uploads
102 101
103 %post 102 %post
104 -groupadd git || true  
105 -if ! id git; then  
106 - adduser --system --home-dir /usr/lib/gitlab --no-create-home --gid git git  
107 -fi  
108 if [ -x /usr/bin/postgres ]; then 103 if [ -x /usr/bin/postgres ]; then
109 service postgresql initdb || true 104 service postgresql initdb || true
110 service postgresql start 105 service postgresql start
@@ -113,7 +108,6 @@ fi @@ -113,7 +108,6 @@ fi
113 mkdir -p /var/log/gitlab 108 mkdir -p /var/log/gitlab
114 chown -R git:git /var/log/gitlab 109 chown -R git:git /var/log/gitlab
115 mkdir -p /var/lib/gitlab/backups 110 mkdir -p /var/lib/gitlab/backups
116 -mkdir -p /var/lib/gitlab/repositories  
117 mkdir -p /var/lib/gitlab/satellites 111 mkdir -p /var/lib/gitlab/satellites
118 mkdir -p /var/lib/gitlab/tmp 112 mkdir -p /var/lib/gitlab/tmp
119 mkdir -p /var/lib/gitlab-uploads 113 mkdir -p /var/lib/gitlab-uploads