• R/O
  • HTTP
  • SSH
  • HTTPS

grid-chef-repo: コミット

Grid環境構築用のChefリポジトリです。


コミットメタ情報

リビジョン54d94ff3c9ba8a142d8f68d9b1ad5cdb15fc6725 (tree)
日時2017-02-19 19:40:52
作者whitestar <whitestar@gaea...>
コミッターwhitestar

ログメッセージ

improves the gitlab-grid::server recipe.

変更サマリ

差分

--- a/cookbooks/gitlab-grid/CHANGELOG.md
+++ b/cookbooks/gitlab-grid/CHANGELOG.md
@@ -1,5 +1,10 @@
11 # gitlab-grid CHANGELOG
22
3+0.1.1
4+-----
5+- improves the `gitlab-grid::server` recipe.
6+- modifies directory permissions.
7+
38 0.1.0
49 -----
510 - Initial release of gitlab-grid
--- a/cookbooks/gitlab-grid/metadata.rb
+++ b/cookbooks/gitlab-grid/metadata.rb
@@ -5,7 +5,7 @@ maintainer_email ''
55 license 'Apache 2.0'
66 description 'Installs/Configures gitlab-grid'
77 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
8-version '0.1.0'
8+version '0.1.1'
99 source_url 'http://scm.osdn.jp/gitroot/metasearch/grid-chef-repo.git'
1010 issues_url 'https://osdn.jp/projects/metasearch/ticket'
1111
--- a/cookbooks/gitlab-grid/recipes/docker-compose.rb
+++ b/cookbooks/gitlab-grid/recipes/docker-compose.rb
@@ -36,8 +36,6 @@ vols = config['services']['gitlab']['volumes'].to_a
3636
3737 [
3838 app_dir,
39- etc_dir,
40- logs_dir,
4139 data_dir,
4240 ].each {|dir|
4341 resources(directory: dir) rescue directory dir do
@@ -48,6 +46,18 @@ vols = config['services']['gitlab']['volumes'].to_a
4846 end
4947 }
5048
49+[
50+ etc_dir,
51+ logs_dir,
52+].each {|dir|
53+ resources(directory: dir) rescue directory dir do
54+ #owner 'root'
55+ group 'root'
56+ #mode '0755'
57+ recursive true
58+ end
59+}
60+
5161 override_config['services']['gitlab']['ports'] = [
5262 '80:80',
5363 '443:443',
--- a/cookbooks/gitlab-grid/recipes/server.rb
+++ b/cookbooks/gitlab-grid/recipes/server.rb
@@ -56,6 +56,7 @@ when 'rhel'
5656 systemctl reload firewalld
5757 EOH
5858 action :run
59+ only_if 'systemctl is-enabled firewalld.service'
5960 end
6061
6162 execute 'add_yum_repo_gitlab-ce' do
旧リポジトリブラウザで表示