improves the `gitlab-grid::server` recipe.

diff --git a/cookbooks/gitlab-grid/CHANGELOG.md b/cookbooks/gitlab-grid/CHANGELOG.md
index 14dc4de..4cdea2f 100644 (file)
--- a/cookbooks/gitlab-grid/CHANGELOG.md
+++ b/cookbooks/gitlab-grid/CHANGELOG.md
@@ -1,5 +1,10 @@
 # gitlab-grid CHANGELOG
 
+0.1.1
+-----
+- improves the `gitlab-grid::server` recipe.
+- modifies directory permissions.
+
 0.1.0
 -----
 - Initial release of gitlab-grid

diff --git a/cookbooks/gitlab-grid/metadata.rb b/cookbooks/gitlab-grid/metadata.rb
index 376585a..a2da54a 100644 (file)
--- a/cookbooks/gitlab-grid/metadata.rb
+++ b/cookbooks/gitlab-grid/metadata.rb
@@ -5,7 +5,7 @@ maintainer_email ''
 license          'Apache 2.0'
 description      'Installs/Configures gitlab-grid'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.0'
+version          '0.1.1'
 source_url       'http://scm.osdn.jp/gitroot/metasearch/grid-chef-repo.git'
 issues_url       'https://osdn.jp/projects/metasearch/ticket'
 

diff --git a/cookbooks/gitlab-grid/recipes/docker-compose.rb b/cookbooks/gitlab-grid/recipes/docker-compose.rb
index e63017d..758cf22 100644 (file)
--- 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
 
 [
   app_dir,
-  etc_dir,
-  logs_dir,
   data_dir,
 ].each {|dir|
   resources(directory: dir) rescue directory dir do
@@ -48,6 +46,18 @@ vols = config['services']['gitlab']['volumes'].to_a
   end
 }
 
+[
+  etc_dir,
+  logs_dir,
+].each {|dir|
+  resources(directory: dir) rescue directory dir do
+    #owner 'root'
+    group 'root'
+    #mode '0755'
+    recursive true
+  end
+}
+
 override_config['services']['gitlab']['ports'] = [
   '80:80',
   '443:443',

diff --git a/cookbooks/gitlab-grid/recipes/server.rb b/cookbooks/gitlab-grid/recipes/server.rb
index 6d1ff56..ceedf46 100644 (file)
--- a/cookbooks/gitlab-grid/recipes/server.rb
+++ b/cookbooks/gitlab-grid/recipes/server.rb
@@ -56,6 +56,7 @@ when 'rhel'
       systemctl reload firewalld
     EOH
     action :run
+    only_if 'systemctl is-enabled firewalld.service'
   end
 
   execute 'add_yum_repo_gitlab-ce' do