| Révision | 68c906cc7a4f03b440608924e9a87e0fb90733c6 (tree) |
|---|---|
| l'heure | 2017-01-11 23:29:03 |
| Auteur | whitestar <whitestar@gaea...> |
| Commiter | whitestar |
adds the apt_utils::apt recipe.
cookbooks/apt_utils/.foodcritic (diff) cookbooks/apt_utils/.rubocop.yml (diff) cookbooks/apt_utils/Berksfile (diff) cookbooks/apt_utils/CHANGELOG.md (diff) cookbooks/apt_utils/README.md (diff) cookbooks/apt_utils/Rakefile (diff) cookbooks/apt_utils/attributes/default.rb (diff) cookbooks/apt_utils/metadata.rb (diff) cookbooks/apt_utils/recipes/apt-cacher-ng.rb (diff) cookbooks/apt_utils/recipes/apt.rb (diff) cookbooks/apt_utils/recipes/conf.rb (diff) cookbooks/apt_utils/recipes/mirror.rb (diff) cookbooks/apt_utils/recipes/source.rb (diff) cookbooks/apt_utils/spec/recipes/apt-cacher-ng_spec.rb (diff) cookbooks/apt_utils/spec/recipes/source_spec.rb (diff)| @@ -0,0 +1 @@ | ||
| 1 | +~FC001 |
| @@ -0,0 +1,37 @@ | ||
| 1 | +AllCops: | |
| 2 | + Exclude: | |
| 3 | + - vendor/**/* | |
| 4 | + | |
| 5 | +AlignParameters: | |
| 6 | + Enabled: false | |
| 7 | +LineLength: | |
| 8 | + Enabled: false | |
| 9 | +Lint/UnusedBlockArgument: | |
| 10 | + Enabled: false | |
| 11 | +Metrics/AbcSize: | |
| 12 | + Enabled: false | |
| 13 | +Style/BlockComments: | |
| 14 | + Enabled: false | |
| 15 | +Style/BlockDelimiters: | |
| 16 | + Enabled: false | |
| 17 | +Style/ExtraSpacing: | |
| 18 | + Enabled: false | |
| 19 | +Style/FileName: | |
| 20 | + Enabled: false | |
| 21 | +Style/LeadingCommentSpace: | |
| 22 | + Enabled: false | |
| 23 | +Style/RescueModifier: | |
| 24 | + Enabled: false | |
| 25 | +Style/SpaceBeforeFirstArg: | |
| 26 | + Enabled: false | |
| 27 | +Style/TrailingCommaInLiteral: | |
| 28 | + EnforcedStyleForMultiline: comma | |
| 29 | +Style/WordArray: | |
| 30 | + Enabled: false | |
| 31 | + | |
| 32 | +#Style/AccessorMethodName: | |
| 33 | +# Enabled: false | |
| 34 | +#Style/MethodLength: | |
| 35 | +# Max: 30 | |
| 36 | +#Style/ModuleLength: | |
| 37 | +# Max: 150 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | # |
| 2 | -# Copyright 2015 whitestar | |
| 2 | +# Copyright 2015-2017 whitestar | |
| 3 | 3 | # |
| 4 | 4 | # Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | 5 | # you may not use this file except in compliance with the License. |
| @@ -17,8 +17,7 @@ | ||
| 17 | 17 | #grid_chef_repo = 'git://git.osdn.jp/gitroot/metasearch/grid-chef-repo.git' |
| 18 | 18 | |
| 19 | 19 | # for ver. 3.x |
| 20 | -#source 'https://gpm00.grid.example.com:6280' | |
| 20 | +#source 'https://berks-api.io.example.com:6280' | |
| 21 | 21 | source 'https://supermarket.chef.io' |
| 22 | 22 | |
| 23 | 23 | metadata |
| 24 | - |
| @@ -1,6 +1,11 @@ | ||
| 1 | 1 | apt_utils CHANGELOG |
| 2 | 2 | =================== |
| 3 | 3 | |
| 4 | +0.2.0 | |
| 5 | +----- | |
| 6 | +- adds the `apt_utils::apt` recipe. | |
| 7 | +- updates cookbook dependencies. | |
| 8 | + | |
| 4 | 9 | 0.1.4 |
| 5 | 10 | ----- |
| 6 | 11 | - update for Ubuntu 16.10 |
| @@ -11,11 +16,11 @@ apt_utils CHANGELOG | ||
| 11 | 16 | |
| 12 | 17 | 0.1.2 |
| 13 | 18 | ----- |
| 14 | -- add ['apt_utils']['apt-cacher-ng']['UseWrap'] attribute. | |
| 19 | +- adds the `['apt_utils']['apt-cacher-ng']['UseWrap']` attribute. | |
| 15 | 20 | |
| 16 | 21 | 0.1.1 |
| 17 | 22 | ----- |
| 18 | -- add APT proxy configuration recipe. | |
| 23 | +- adds APT proxy configuration recipe. | |
| 19 | 24 | |
| 20 | 25 | 0.1.0 |
| 21 | 26 | ----- |
| @@ -3,16 +3,31 @@ apt_utils Cookbook | ||
| 3 | 3 | |
| 4 | 4 | This cookbook includes apt utility (apt-cacher-ng, apt mirroring site setup and apt source configuration) recipes. |
| 5 | 5 | |
| 6 | -Requirements | |
| 7 | ------------- | |
| 6 | +## Contents | |
| 8 | 7 | |
| 9 | -#### packages | |
| 10 | -- `commons` - local cookbook. | |
| 8 | +- [Requirements](#requirements) | |
| 9 | + - [packages](#packages) | |
| 10 | +- [Attributes](#attributes) | |
| 11 | + - [apt_utils::default](#apt_utilsdefault) | |
| 12 | +- [Usage](#usage) | |
| 13 | + - [Recipes](#recipes) | |
| 14 | + - [apt_utils::apt](#apt_utilsapt) | |
| 15 | + - [apt_utils::conf](#apt_utilsconf) | |
| 16 | + - [apt_utils::apt-cacher-ng](#apt_utilsapt-cacher-ng) | |
| 17 | + - [apt_utils::mirror](#apt_utilsmirror) | |
| 18 | + - [apt_utils::source](#apt_utilssource) | |
| 19 | +- [License and Authors](#license-and-authors) | |
| 11 | 20 | |
| 12 | -Attributes | |
| 13 | ----------- | |
| 21 | +## Requirements | |
| 14 | 22 | |
| 15 | -#### apt_utils::default | |
| 23 | +### packages | |
| 24 | + | |
| 25 | +- `apt` | |
| 26 | +- `platform_utils` >= 0.4.0 | |
| 27 | + | |
| 28 | +## Attributes | |
| 29 | + | |
| 30 | +### apt_utils::default | |
| 16 | 31 | |
| 17 | 32 | |Key|Type|Description (with examples)|Default| |
| 18 | 33 | |:--|:--|:--|:--| |
| @@ -31,14 +46,21 @@ Attributes | ||
| 31 | 46 | |`['apt_utils']['mirror']['nthreads']`|String|worker threads number.|`'20'`| |
| 32 | 47 | |`['apt_utils']['mirror']['_tilde']`|||`'0'`| |
| 33 | 48 | |`['apt_utils']['mirror']['country']`|String|mirroring source country.|`'us'`| |
| 34 | -|`['apt_utils']['mirror']['distributions']['debian']`|Hash|Debian's mirroring apt lines.|refer to attributes/default.rb| | |
| 35 | -|`['apt_utils']['mirror']['distributions']['ubuntu']`|Hash|Ubuntu's mirroring apt lines.|refer to attributes/default.rb| | |
| 36 | -|`['apt_utils']['source']['apt_lines']['ubuntu']`|Array|apt source lines.|refer to attributes/default.rb| | |
| 49 | +|`['apt_utils']['mirror']['distributions']['debian']`|Hash|Debian's mirroring apt lines.|refer to `attributes/default.rb`| | |
| 50 | +|`['apt_utils']['mirror']['distributions']['ubuntu']`|Hash|Ubuntu's mirroring apt lines.|refer to `attributes/default.rb`| | |
| 51 | +|`['apt_utils']['source']['apt_lines']['ubuntu']`|Array|apt source lines.|refer to `attributes/default.rb`| | |
| 52 | + | |
| 53 | +## Usage | |
| 54 | + | |
| 55 | +### Recipes | |
| 56 | + | |
| 57 | +#### apt_utils::apt | |
| 58 | + | |
| 59 | +- includes `apt::default` recipe if the platform family is `debian`. | |
| 37 | 60 | |
| 38 | -Usage | |
| 39 | ------ | |
| 40 | 61 | #### apt_utils::conf |
| 41 | -- deploy apt configuration files to the /etc/apt/apt.conf.d directory. | |
| 62 | + | |
| 63 | +- deploys apt configuration files to the `/etc/apt/apt.conf.d` directory. | |
| 42 | 64 | |
| 43 | 65 | #### apt_utils::apt-cacher-ng |
| 44 | 66 |
| @@ -73,12 +95,12 @@ Usage | ||
| 73 | 95 | } |
| 74 | 96 | ``` |
| 75 | 97 | |
| 76 | -License and Authors | |
| 77 | -------------------- | |
| 98 | +## License and Authors | |
| 99 | + | |
| 78 | 100 | - Author:: whitestar at osdn.jp |
| 79 | 101 | |
| 80 | 102 | ```text |
| 81 | -Copyright 2013-2016, whitestar | |
| 103 | +Copyright 2013-2017, whitestar | |
| 82 | 104 | |
| 83 | 105 | Licensed under the Apache License, Version 2.0 (the "License"); |
| 84 | 106 | you may not use this file except in compliance with the License. |
| @@ -0,0 +1,23 @@ | ||
| 1 | +require 'rspec/core/rake_task' | |
| 2 | +require 'rubocop/rake_task' | |
| 3 | +require 'foodcritic' | |
| 4 | + | |
| 5 | +namespace :style do | |
| 6 | + desc 'Run Ruby style checks' | |
| 7 | + RuboCop::RakeTask.new(:ruby) | |
| 8 | + | |
| 9 | + desc 'Run Chef style checks' | |
| 10 | + FoodCritic::Rake::LintTask.new(:chef) do |t| | |
| 11 | + t.options = { | |
| 12 | + fail_tags: ['any'], | |
| 13 | + } | |
| 14 | + end | |
| 15 | +end | |
| 16 | + | |
| 17 | +desc 'Run all style checks' | |
| 18 | +task style: ['style:chef', 'style:ruby'] | |
| 19 | + | |
| 20 | +desc 'Run ChefSpec examples' | |
| 21 | +RSpec::Core::RakeTask.new(:spec) | |
| 22 | + | |
| 23 | +task default: ['style', 'spec'] |
| @@ -2,7 +2,7 @@ | ||
| 2 | 2 | # Cookbook Name:: apt_utils |
| 3 | 3 | # Attributes:: default |
| 4 | 4 | # |
| 5 | -# Copyright 2013-2016, whitestar | |
| 5 | +# Copyright 2013-2017, whitestar | |
| 6 | 6 | # |
| 7 | 7 | # Licensed under the Apache License, Version 2.0 (the "License"); |
| 8 | 8 | # you may not use this file except in compliance with the License. |
| @@ -29,7 +29,7 @@ default['apt_utils']['source']['apt_lines'] = [ | ||
| 29 | 29 | 'deb http://cdn.debian.net/debian wheezy main contrib non-free', |
| 30 | 30 | 'deb http://cdn.debian.net/debian wheezy-updates main contrib', |
| 31 | 31 | 'deb http://cdn.debian.net/debian wheezy-backports main contrib non-free', |
| 32 | - 'deb http://security.debian.org/ wheezy/updates main contrib non-free' | |
| 32 | + 'deb http://security.debian.org/ wheezy/updates main contrib non-free', | |
| 33 | 33 | # mirror example. |
| 34 | 34 | #'deb http://ftp.grid.example.com/debian wheezy main contrib non-free', |
| 35 | 35 | #'deb http://ftp.grid.example.com/debian wheezy-updates main contrib', |
| @@ -60,18 +60,18 @@ default['apt_utils']['mirror']['distributions']['debian'] = { | ||
| 60 | 60 | #'wheezy', |
| 61 | 61 | #'wheezy-updates', |
| 62 | 62 | #'wheezy-backports', |
| 63 | - #'squeeze' | |
| 63 | + #'squeeze', | |
| 64 | 64 | ], |
| 65 | 65 | 'architectures' => [ |
| 66 | 66 | 'amd64', |
| 67 | - 'i386' | |
| 67 | + 'i386', | |
| 68 | 68 | #'src', |
| 69 | 69 | ], |
| 70 | 70 | 'components' => [ |
| 71 | 71 | 'main', |
| 72 | 72 | 'contrib', |
| 73 | - 'non-free' | |
| 74 | - ] | |
| 73 | + 'non-free', | |
| 74 | + ], | |
| 75 | 75 | } |
| 76 | 76 | default['apt_utils']['mirror']['distribution']['ubuntu'] = { |
| 77 | 77 | # default: empty (inactive) |
| @@ -90,7 +90,5 @@ default['apt_utils']['mirror']['distribution']['ubuntu'] = { | ||
| 90 | 90 | 'universe', |
| 91 | 91 | 'multiverse', |
| 92 | 92 | 'restricted', |
| 93 | - ] | |
| 93 | + ], | |
| 94 | 94 | } |
| 95 | - | |
| 96 | - |
| @@ -1,11 +1,17 @@ | ||
| 1 | +# $ knife supermarket share apt_utils "Operating Systems & Virtualization" | |
| 1 | 2 | name 'apt_utils' |
| 2 | 3 | maintainer 'whitestar' |
| 3 | 4 | maintainer_email '' |
| 4 | 5 | license 'Apache 2.0' |
| 5 | -description 'Installs/Configures apt_utils' | |
| 6 | +description 'Installs/Configures APT' | |
| 6 | 7 | long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) |
| 7 | -version '0.1.4' | |
| 8 | +version '0.2.0' | |
| 9 | +source_url 'http://scm.osdn.jp/gitroot/metasearch/grid-chef-repo.git' | |
| 10 | +issues_url 'https://osdn.jp/projects/metasearch/ticket' | |
| 8 | 11 | |
| 9 | -# local cookbooks | |
| 10 | -depends 'commons' | |
| 12 | +%w( debian ubuntu ).each do |os| | |
| 13 | + supports os | |
| 14 | +end | |
| 11 | 15 | |
| 16 | +depends 'apt' | |
| 17 | +depends 'platform_utils', '>= 0.4.0' |
| @@ -2,7 +2,7 @@ | ||
| 2 | 2 | # Cookbook Name:: apt_utils |
| 3 | 3 | # Recipe:: apt-cacher-ng |
| 4 | 4 | # |
| 5 | -# Copyright 2013, whitestar | |
| 5 | +# Copyright 2013-2017, whitestar | |
| 6 | 6 | # |
| 7 | 7 | # Licensed under the Apache License, Version 2.0 (the "License"); |
| 8 | 8 | # you may not use this file except in compliance with the License. |
| @@ -17,19 +17,19 @@ | ||
| 17 | 17 | # limitations under the License. |
| 18 | 18 | # |
| 19 | 19 | |
| 20 | -::Chef::Recipe.send(:include, Commons::PackageUtils) | |
| 20 | +::Chef::Recipe.send(:include, PlatformUtils::PackageUtils) | |
| 21 | 21 | |
| 22 | -if node[:platform_family] == 'debian' then | |
| 22 | +if node['platform_family'] == 'debian' | |
| 23 | 23 | pkg = 'apt-cacher-ng' |
| 24 | 24 | user_name = pkg |
| 25 | - resources(:package => pkg) rescue package pkg do | |
| 25 | + resources(package: pkg) rescue package pkg do | |
| 26 | 26 | action :install |
| 27 | 27 | end |
| 28 | 28 | |
| 29 | 29 | service_name = pkg |
| 30 | - resources(:service => service_name) rescue service service_name do | |
| 30 | + resources(service: service_name) rescue service service_name do | |
| 31 | 31 | action [:enable, :start] |
| 32 | - supports :status => true, :restart => true, :reload => false | |
| 32 | + supports status: true, restart: true, reload: false | |
| 33 | 33 | end |
| 34 | 34 | |
| 35 | 35 | directory node['apt_utils']['apt-cacher-ng']['CacheDir'] do |
| @@ -38,7 +38,7 @@ if node[:platform_family] == 'debian' then | ||
| 38 | 38 | mode '2755' |
| 39 | 39 | recursive true |
| 40 | 40 | end |
| 41 | - | |
| 41 | + | |
| 42 | 42 | directory node['apt_utils']['apt-cacher-ng']['LogDir'] do |
| 43 | 43 | owner user_name |
| 44 | 44 | group user_name |
| @@ -54,4 +54,3 @@ if node[:platform_family] == 'debian' then | ||
| 54 | 54 | notifies :restart, "service[#{service_name}]" |
| 55 | 55 | end |
| 56 | 56 | end |
| 57 | - |
| @@ -0,0 +1,25 @@ | ||
| 1 | +# | |
| 2 | +# Cookbook Name:: apt_utils | |
| 3 | +# Recipe:: apt | |
| 4 | +# | |
| 5 | +# Copyright 2017, whitestar | |
| 6 | +# | |
| 7 | +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| 8 | +# you may not use this file except in compliance with the License. | |
| 9 | +# You may obtain a copy of the License at | |
| 10 | +# | |
| 11 | +# http://www.apache.org/licenses/LICENSE-2.0 | |
| 12 | +# | |
| 13 | +# Unless required by applicable law or agreed to in writing, software | |
| 14 | +# distributed under the License is distributed on an "AS IS" BASIS, | |
| 15 | +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| 16 | +# See the License for the specific language governing permissions and | |
| 17 | +# limitations under the License. | |
| 18 | +# | |
| 19 | + | |
| 20 | +if node['platform_family'] == 'debian' | |
| 21 | + # "If a recipe is included more than once in a recipe, only the first | |
| 22 | + # inclusion will be processed and any subsequent inclusion will be ignored." | |
| 23 | + # from http://docs.opscode.com/essentials_cookbook_recipes_in_recipes.html | |
| 24 | + include_recipe 'apt::default' | |
| 25 | +end |
| @@ -2,7 +2,7 @@ | ||
| 2 | 2 | # Cookbook Name:: apt_utils |
| 3 | 3 | # Recipe:: conf |
| 4 | 4 | # |
| 5 | -# Copyright 2016, whitestar | |
| 5 | +# Copyright 2016-2017, whitestar | |
| 6 | 6 | # |
| 7 | 7 | # Licensed under the Apache License, Version 2.0 (the "License"); |
| 8 | 8 | # you may not use this file except in compliance with the License. |
| @@ -17,15 +17,14 @@ | ||
| 17 | 17 | # limitations under the License. |
| 18 | 18 | # |
| 19 | 19 | |
| 20 | -if node[:platform_family] == 'debian' then | |
| 20 | +if node['platform_family'] == 'debian' | |
| 21 | 21 | proxy_conf = node['apt_utils']['conf']['proxy'] |
| 22 | - if !proxy_conf['ftp'].nil? || !proxy_conf['http'].nil? || !proxy_conf['https'].nil? then | |
| 23 | - template "/etc/apt/apt.conf.d/#{proxy_conf['sequence']}proxy" do | |
| 24 | - source 'etc/apt/apt.conf.d/proxy' | |
| 25 | - owner 'root' | |
| 26 | - group 'root' | |
| 27 | - mode '0644' | |
| 28 | - end | |
| 22 | + | |
| 23 | + template "/etc/apt/apt.conf.d/#{proxy_conf['sequence']}proxy" do | |
| 24 | + source 'etc/apt/apt.conf.d/proxy' | |
| 25 | + owner 'root' | |
| 26 | + group 'root' | |
| 27 | + mode '0644' | |
| 28 | + only_if { !proxy_conf['ftp'].nil? || !proxy_conf['http'].nil? || !proxy_conf['https'].nil? } | |
| 29 | 29 | end |
| 30 | 30 | end |
| 31 | - |
| @@ -2,7 +2,7 @@ | ||
| 2 | 2 | # Cookbook Name:: apt_utils |
| 3 | 3 | # Recipe:: mirror |
| 4 | 4 | # |
| 5 | -# Copyright 2013, whitestar | |
| 5 | +# Copyright 2013-2017, whitestar | |
| 6 | 6 | # |
| 7 | 7 | # Licensed under the Apache License, Version 2.0 (the "License"); |
| 8 | 8 | # you may not use this file except in compliance with the License. |
| @@ -17,22 +17,22 @@ | ||
| 17 | 17 | # limitations under the License. |
| 18 | 18 | # |
| 19 | 19 | |
| 20 | -::Chef::Recipe.send(:include, Commons::PackageUtils) | |
| 20 | +::Chef::Recipe.send(:include, PlatformUtils::PackageUtils) | |
| 21 | 21 | |
| 22 | 22 | pkg = 'apt-mirror' # CentOS: in the EPEL |
| 23 | -resources(:package => pkg) rescue package pkg do | |
| 23 | +resources(package: pkg) rescue package pkg do | |
| 24 | 24 | action :install |
| 25 | 25 | end |
| 26 | 26 | |
| 27 | 27 | mirror_user = node['apt_utils']['mirror']['user'] |
| 28 | 28 | base_path = node['apt_utils']['mirror']['base_path'] |
| 29 | 29 | |
| 30 | -resources(:group => mirror_user) rescue group mirror_user do | |
| 30 | +resources(group: mirror_user) rescue group mirror_user do | |
| 31 | 31 | system true |
| 32 | 32 | action :create |
| 33 | 33 | end |
| 34 | 34 | |
| 35 | -resources(:user => mirror_user) rescue user mirror_user do | |
| 35 | +resources(user: mirror_user) rescue user mirror_user do | |
| 36 | 36 | gid mirror_user |
| 37 | 37 | system true |
| 38 | 38 | home base_path |
| @@ -48,18 +48,18 @@ bash "#{base_path} - change owner to #{mirror_user}:#{mirror_user} recursively." | ||
| 48 | 48 | end |
| 49 | 49 | |
| 50 | 50 | mirror_list_path = nil |
| 51 | -httpd_service = get_httpd_pkg_name | |
| 51 | +httpd_service = httpd_pkg_name | |
| 52 | 52 | httpd_conf_path = nil |
| 53 | 53 | |
| 54 | -case node[:platform_family] | |
| 54 | +case node['platform_family'] | |
| 55 | 55 | when 'debian' |
| 56 | 56 | mirror_list_path = '/etc/apt/mirror.list' |
| 57 | - case node[:platform_version].to_i | |
| 58 | - when 8 | |
| 59 | - httpd_conf_path = "/etc/#{httpd_service}/conf-available/apt-mirror.conf" | |
| 60 | - else | |
| 61 | - httpd_conf_path = "/etc/#{httpd_service}/conf.d/apt-mirror" | |
| 62 | - end | |
| 57 | + httpd_conf_path = case node['platform_version'].to_i | |
| 58 | + when 8 | |
| 59 | + "/etc/#{httpd_service}/conf-available/apt-mirror.conf" | |
| 60 | + else | |
| 61 | + "/etc/#{httpd_service}/conf.d/apt-mirror" | |
| 62 | + end | |
| 63 | 63 | when 'rhel' |
| 64 | 64 | mirror_list_path = '/etc/apt-mirror.list' |
| 65 | 65 | httpd_conf_path = "/etc/#{httpd_service}/conf.d/apt-mirror.conf" |
| @@ -72,8 +72,8 @@ template mirror_list_path do | ||
| 72 | 72 | mode '0644' |
| 73 | 73 | end |
| 74 | 74 | |
| 75 | -pkg = get_cron_pkg_name | |
| 76 | -resources(:package => pkg) rescue package pkg do | |
| 75 | +pkg = cron_pkg_name | |
| 76 | +resources(package: pkg) rescue package pkg do | |
| 77 | 77 | action :install |
| 78 | 78 | end |
| 79 | 79 |
| @@ -85,13 +85,13 @@ template '/etc/cron.d/apt-mirror' do | ||
| 85 | 85 | end |
| 86 | 86 | |
| 87 | 87 | pkg = httpd_service |
| 88 | -resources(:package => pkg) rescue package pkg do | |
| 88 | +resources(package: pkg) rescue package pkg do | |
| 89 | 89 | action :install |
| 90 | 90 | end |
| 91 | 91 | |
| 92 | -resources(:service => httpd_service) rescue service httpd_service do | |
| 92 | +resources(service: httpd_service) rescue service httpd_service do | |
| 93 | 93 | action [:enable, :start] |
| 94 | - supports :status => true, :restart => true, :reload => true | |
| 94 | + supports status: true, restart: true, reload: true | |
| 95 | 95 | end |
| 96 | 96 | |
| 97 | 97 | template httpd_conf_path do |
| @@ -101,4 +101,3 @@ template httpd_conf_path do | ||
| 101 | 101 | mode '0644' |
| 102 | 102 | notifies :restart, "service[#{httpd_service}]" |
| 103 | 103 | end |
| 104 | - |
| @@ -17,12 +17,10 @@ | ||
| 17 | 17 | # limitations under the License. |
| 18 | 18 | # |
| 19 | 19 | |
| 20 | -if node[:platform_family] == 'debian' then | |
| 21 | - template '/etc/apt/sources.list' do | |
| 22 | - source 'etc/apt/sources.list' | |
| 23 | - owner 'root' | |
| 24 | - group 'root' | |
| 25 | - mode '0644' | |
| 26 | - end | |
| 20 | +template '/etc/apt/sources.list' do | |
| 21 | + source 'etc/apt/sources.list' | |
| 22 | + owner 'root' | |
| 23 | + group 'root' | |
| 24 | + mode '0644' | |
| 25 | + only_if { node['platform_family'] == 'debian' } | |
| 27 | 26 | end |
| 28 | - |
| @@ -2,7 +2,7 @@ | ||
| 2 | 2 | # Cookbook Name:: apt_utils |
| 3 | 3 | # Recipe Spec:: apt-cacher-ng_spec |
| 4 | 4 | # |
| 5 | -# Copyright 2015, whitestar | |
| 5 | +# Copyright 2015-2017, whitestar | |
| 6 | 6 | # |
| 7 | 7 | # Licensed under the Apache License, Version 2.0 (the "License"); |
| 8 | 8 | # you may not use this file except in compliance with the License. |
| @@ -56,11 +56,11 @@ describe 'apt_utils::apt-cacher-ng' do | ||
| 56 | 56 | expected.to create_directory('/path/to/cache') |
| 57 | 57 | expected.to create_directory('/path/to/log') |
| 58 | 58 | end |
| 59 | - | |
| 59 | + | |
| 60 | 60 | it 'renders /etc/apt-cacher-ng/acng.conf on debian family.' do |
| 61 | 61 | expect(chef_run_on_debian).to \ |
| 62 | - render_file('/etc/apt-cacher-ng/acng.conf'). | |
| 63 | - with_content(%r|^CacheDir:\s+/path/to/cache$|) | |
| 62 | + render_file('/etc/apt-cacher-ng/acng.conf') | |
| 63 | + .with_content(%r{^CacheDir:\s+/path/to/cache$}) | |
| 64 | 64 | end |
| 65 | 65 | |
| 66 | 66 | it 'notifies apt-cacher-ng service\'s restart after rendering on debian family.' do |
| @@ -68,4 +68,3 @@ describe 'apt_utils::apt-cacher-ng' do | ||
| 68 | 68 | notify('service[apt-cacher-ng]').to(:restart).delayed |
| 69 | 69 | end |
| 70 | 70 | end |
| 71 | - |
| @@ -21,8 +21,9 @@ require_relative '../spec_helper' | ||
| 21 | 21 | |
| 22 | 22 | describe 'apt_utils::source' do |
| 23 | 23 | let(:chef_run_on_non_debian) { |
| 24 | - ChefSpec::SoloRunner.new(platform: 'centos', version: '7.0'). | |
| 25 | - converge(described_recipe) | |
| 24 | + ChefSpec::SoloRunner | |
| 25 | + .new(platform: 'centos', version: '7.0') | |
| 26 | + .converge(described_recipe) | |
| 26 | 27 | } |
| 27 | 28 | |
| 28 | 29 | it 'does nothing on non debian family.' do |
| @@ -40,10 +41,9 @@ describe 'apt_utils::source' do | ||
| 40 | 41 | |
| 41 | 42 | it 'renders /etc/apt/sources.list on debian family.' do |
| 42 | 43 | expected = expect(chef_run_on_debian) |
| 43 | - expected.to render_file('/etc/apt/sources.list'). | |
| 44 | - with_content('deb http://cdn.debian.net/debian jessie main contrib non-free') | |
| 45 | - expected.to render_file('/etc/apt/sources.list'). | |
| 46 | - with_content('deb http://cdn.debian.net/debian jessie-updates main contrib') | |
| 44 | + expected.to render_file('/etc/apt/sources.list') | |
| 45 | + .with_content('deb http://cdn.debian.net/debian jessie main contrib non-free') | |
| 46 | + expected.to render_file('/etc/apt/sources.list') | |
| 47 | + .with_content('deb http://cdn.debian.net/debian jessie-updates main contrib') | |
| 47 | 48 | end |
| 48 | 49 | end |
| 49 | - |
Fork