瀏覽代碼

fix(etckeeper): Fix the cookbook 'etckeeer' for gateway

JIRA: master

Signed-off-by: Jeremy MAURO <jeremy.mauro@gmail.com>
Jeremy MAURO 2 年之前
父節點
當前提交
052c9dd20d
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 3 3
      cookbooks/gateway/recipes/default.rb
  2. 1 1
      gateway.rb

+ 3 - 3
cookbooks/gateway/recipes/default.rb

@@ -10,6 +10,9 @@ chef_handler 'Chef::Handler::JsonFile' do
   arguments path: '/var/chef/reports'
   action :enable
 end
+# Setup etckeeper
+include_recipe 'etckeeper'
+include_recipe 'etckeeper::commit'
 
 # Configure repo
 include_recipe 'apt_repositories::_official'
@@ -23,9 +26,6 @@ include_recipe 'gateway::_git'
 # Add defaut packages
 include_recipe 'gateway::_packages'
 
-# END: Setup etckeeper
-include_recipe 'etckeeper'
-include_recipe 'etckeeper::commit'
 
 # Patching /etc
 include_recipe 'gateway::_system_patch'

+ 1 - 1
gateway.rb

@@ -60,7 +60,7 @@ named_run_list :packages, @named_run_lists[:apt] + [
 
 # Specify a custom source for a single cookbook:
 # cookbook 'example_cookbook', path: '../cookbooks/example_cookbook'
-cookbook 'etckeeper', git: 'https://github.com/pioneerit/etckeeper-cookbook'
+cookbook 'etckeeper', git: 'https://github.com/jmauro/etckeeper-cookbook', branch: 'master-next'
 cookbook 'git', git: 'https://github.com/jmauro/git', branch: 'config_file_scope'
 cookbook 'resolver', git: 'https://github.com/jmauro/resolver', branch: 'atomic_update'