diff --git a/.gitignore b/.gitignore index 80da1cd..ac3eac0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,4 @@ -*.gem -.zero-knife.rb *.rbc -.bundle .config coverage InstalledFiles @@ -12,7 +9,6 @@ spec/reports test/tmp test/version_tmp tmp -Gemfile.lock _Store *~ *# @@ -23,9 +19,14 @@ _Store *.tmp *.bk *.bkup + +# ruby/bundler files .ruby-version .ruby-gemset .rvmrc +Gemfile.lock +.bundle +*.gem # YARD artifacts .yardoc @@ -39,6 +40,7 @@ Berksfile.lock .kitchen.local.yml vendor/ .coverage/ +.zero-knife.rb #vagrant stuff .vagrant/ diff --git a/.kitchen.docker.yml b/.kitchen.docker.yml index a3ab035..ba8e73c 100644 --- a/.kitchen.docker.yml +++ b/.kitchen.docker.yml @@ -1,45 +1,100 @@ -settings: - parallel: true - driver: - name: docker - # privileged is required otherwise the container doesn't boot right - privileged: true + name: dokken + chef_version: latest + privileged: true # because Docker and SystemD/Upstart + +transport: + name: dokken + +provisioner: + name: dokken + +verifier: + name: inspec + format: doc platforms: +- name: debian-7 + driver: + image: debian:7 + pid_one_command: /sbin/init + intermediate_instructions: + - RUN /usr/bin/apt-get update + - RUN /usr/bin/apt-get install lsb-release -y + +- name: debian-8 + driver: + image: debian:8 + pid_one_command: /bin/systemd + intermediate_instructions: + - RUN /usr/bin/apt-get update + - RUN /usr/bin/apt-get install lsb-release -y + +- name: centos-5 + driver: + image: centos:5 + platform: rhel + pid_one_command: /sbin/init + intermediate_instructions: + - RUN yum install -y which initscripts + - name: centos-6 driver: image: centos:6 platform: rhel - run_command: /sbin/init - provision_command: - - /usr/bin/yum install -y initscripts net-tools wget + pid_one_command: /sbin/init + intermediate_instructions: + - RUN yum -y install which initscripts + - name: centos-7 driver: image: centos:7 platform: rhel - run_command: /usr/lib/systemd/systemd - provision_command: - - /bin/yum install -y initscripts net-tools wget + pid_one_command: /usr/lib/systemd/systemd + intermediate_instructions: + - RUN yum -y install lsof which systemd-sysv initscripts + +- name: fedora-latest + driver: + image: fedora:latest + pid_one_command: /usr/lib/systemd/systemd + intermediate_instructions: + - RUN dnf -y install yum which systemd-sysv initscripts + - name: ubuntu-12.04 driver: image: ubuntu-upstart:12.04 - platform: ubuntu - disable_upstart: false - run_command: /sbin/init - provision_command: - - /usr/bin/apt-get update - - /usr/bin/apt-get install apt-transport-https net-tools -y + pid_one_command: /sbin/init + intermediate_instructions: + - RUN /usr/bin/apt-get update + - name: ubuntu-14.04 driver: image: ubuntu-upstart:14.04 - platform: ubuntu - disable_upstart: false - run_command: /sbin/init - provision_command: - - /usr/bin/apt-get update - - /usr/bin/apt-get install apt-transport-https net-tools -y + pid_one_command: /sbin/init + intermediate_instructions: + - RUN /usr/bin/apt-get update +- name: ubuntu-16.04 + driver: + image: ubuntu:16.04 + pid_one_command: /bin/systemd + intermediate_instructions: + - RUN /usr/bin/apt-get update + +- name: opensuse-13.2 + driver: + image: opensuse:13.2 + pid_one_command: /bin/systemd + intermediate_instructions: + - RUN zypper --non-interactive install aaa_base perl-Getopt-Long-Descriptive + +- name: opensuse-42.1 + driver: + image: opensuse:42.1 + pid_one_command: /bin/systemd + intermediate_instructions: + - RUN zypper --non-interactive install aaa_base perl-Getopt-Long-Descriptive suites: - name: server run_list: diff --git a/.kitchen.yml b/.kitchen.yml index 82e1b1a..8e69a3d 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -11,13 +11,14 @@ platforms: run_list: apt::default - name: debian-8.4 run_list: apt::default - - name: fedora-21 - - name: fedora-22 + - name: fedora-23 + run_list: yum::dnf_yum_compat + - name: opensuse-13.2 - name: ubuntu-12.04 run_list: apt::default - name: ubuntu-14.04 run_list: apt::default - - name: freebsd-10.1 + - name: freebsd-10.3 run_list: freebsd::pkgng suites: diff --git a/.rubocop.yml b/.rubocop.yml index 5f80f6f..a83164c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,33 +1,10 @@ -AllCops: +# cookstyle todo +# +Lint/AmbiguousRegexpLiteral: Exclude: - - vendor/**/* - - Guardfile - - files/default/test/**/* - - Rakefile + - 'files/default/test/auth_test.rb' -AlignParameters: - Enabled: false -ClassLength: - Enabled: false -CyclomaticComplexity: - Enabled: false -Documentation: - Enabled: false -Encoding: - Enabled: false -Style/FileName: - Enabled: false -LineLength: - Enabled: false -MethodLength: - Enabled: false -Metrics/AbcSize: - Enabled: false -PerceivedComplexity: - Enabled: false -Style/SpaceBeforeFirstArg: - Enabled: false -Style/ClassAndModuleChildren: - Enabled: false -Style/FileName: - Enabled: false +# Configuration parameters: AllowedVariables. +Style/GlobalVars: + Exclude: + - 'Rakefile' diff --git a/.travis.yml b/.travis.yml index 3937208..480eb62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,13 @@ addons: packages: - chefdk +# Don't `bundle install` which takes about 1.5 mins +install: echo "skip bundle install" + +branches: + only: + - master + services: docker env: @@ -18,20 +25,17 @@ env: - INSTANCE=server-centos-6 - INSTANCE=server-centos-7 -# Don't `bundle install` -install: echo "skip bundle install" + fast_finish: true -# Ensure we make ChefDK's Ruby the default before_script: - # https://github.com/zuazo/kitchen-in-travis-native/issues/1#issuecomment-142230889 - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) - eval "$(/opt/chefdk/bin/chef shell-init bash)" - - /opt/chefdk/embedded/bin/chef gem install kitchen-docker + script: - /opt/chefdk/embedded/bin/chef --version - - /opt/chefdk/embedded/bin/rubocop --version - - /opt/chefdk/embedded/bin/rubocop + - /opt/chefdk/embedded/bin/cookstyle --version + - /opt/chefdk/embedded/bin/cookstyle - /opt/chefdk/embedded/bin/foodcritic --version - - /opt/chefdk/embedded/bin/foodcritic . --exclude spec + - /opt/chefdk/embedded/bin/foodcritic . --exclude spec -f any -P - /opt/chefdk/embedded/bin/rspec - KITCHEN_LOCAL_YAML=.kitchen.docker.yml /opt/chefdk/embedded/bin/kitchen verify ${INSTANCE} diff --git a/Gemfile b/Gemfile index 3653c3c..9555d68 100644 --- a/Gemfile +++ b/Gemfile @@ -1,29 +1,13 @@ source 'https://rubygems.org' -group :rake do - gem 'rake' - gem 'tomlrb' -end - -group :lint do - gem 'foodcritic', '~> 5.0' - gem 'rubocop', '~> 0.34' -end - -group :unit do - gem 'berkshelf', '~> 4.0' - gem 'chefspec', '~> 4.4' -end - -group :kitchen_common do - gem 'test-kitchen', '~> 1.4' -end - -group :kitchen_vagrant do - gem 'kitchen-vagrant', '~> 0.19' -end - -group :kitchen_cloud do - gem 'kitchen-digitalocean' - gem 'kitchen-ec2' -end +gem 'berkshelf', '>= 4.3' +gem 'chefspec', '~> 4.6' +gem 'cookstyle' +gem 'foodcritic', '~> 7.0' +gem 'kitchen-dokken' +gem 'kitchen-inspec', '>= 0.14' +gem 'kitchen-vagrant', '>= 0.20' +gem 'rake' +gem 'stove' +gem 'test-kitchen', '>= 1.10' +gem 'tomlrb' diff --git a/LICENSE b/LICENSE index 1b91cbb..8f71f43 100644 --- a/LICENSE +++ b/LICENSE @@ -1,201 +1,202 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright 2008-2015 Chef Software Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/MAINTAINERS.md b/MAINTAINERS.md index c6a51ae..00eed8d 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -14,6 +14,5 @@ for details on the process and how to become a maintainer or the project lead. # Maintainers * [Jennifer Davis](https://github.com/sigje) -* [Sean OMeara](https://github.com/someara) * [Tim Smith](https://github.com/tas50) * [Thom May](https://github.com/thommay) diff --git a/MAINTAINERS.toml b/MAINTAINERS.toml index 47778d6..d378766 100644 --- a/MAINTAINERS.toml +++ b/MAINTAINERS.toml @@ -23,7 +23,6 @@ for details on the process and how to become a maintainer or the project lead. maintainers = [ 'sigje', - 'someara', 'tas50', 'thommay' ] @@ -33,10 +32,6 @@ for details on the process and how to become a maintainer or the project lead. name = "Jennifer Davis" github = "sigje" - [people.someara] - name = "Sean OMeara" - github = "someara" - [people.tas50] name = "Tim Smith" github = "tas50" diff --git a/README.md b/README.md index 8fb76fa..ef5d5e7 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,10 @@ Configures a server to be an OpenLDAP master, OpenLDAP replication slave, or Ope Requirements ------------ #### Platforms -- Ubuntu 10.04+ +- Ubuntu 12.04+ - Debian - FreeBSD 10 -- RHEL and derivitives +- RHEL and derivatives #### Chef - Chef 11+ @@ -133,7 +133,7 @@ License & Authors **Author:** Cookbook Engineering Team () -**Copyright:** 2008-2015, Chef Software, Inc. +**Copyright:** 2008-2016, Chef Software, Inc. ``` Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/Rakefile b/Rakefile index bae4e18..6d14ab5 100644 --- a/Rakefile +++ b/Rakefile @@ -1,48 +1,41 @@ -# Rakefile for OpenLDAP cookbook. -# Primarily used for generating SSL certificate(s). -# Extend with other OpenLDAP related tasks as required. +require 'rspec/core/rake_task' +require 'cookstyle' +require 'rubocop/rake_task' +require 'foodcritic' +require 'kitchen' -require 'tempfile' +require_relative 'tasks/maintainers' -COMPANY_NAME = 'Company' -SSL_COUNTRY_NAME = 'US' -SSL_STATE_NAME = 'State' -SSL_LOCALITY_NAME = 'City' -SSL_ORGANIZATIONAL_UNIT_NAME = 'Operations' -SSL_EMAIL_ADDRESS = 'operations@example.com' -CADIR = File.expand_path(File.join(File.dirname(__FILE__), 'files', 'default', 'ssl')) +# # Style tests. cookstyle (rubocop) and Foodcritic +namespace :style do + desc 'Run Ruby style checks' + RuboCop::RakeTask.new(:ruby) -desc 'Create a new self-signed SSL certificate for FQDN=foo.example.com' -task :ssl_cert do - $expect_verbose = true - fqdn = ENV['FQDN'] - fqdn =~ /^(.+?)\.(.+)$/ - hostname = Regexp.last_match[1] - domain = Regexp.last_match[2] - fail 'Must provide FQDN!' unless fqdn && hostname && domain - puts "** Creating self signed SSL Certificate for #{fqdn}" - sh("(cd #{CADIR} && openssl genrsa 2048 > #{fqdn}.key)") - sh("(cd #{CADIR} && chmod 644 #{fqdn}.key)") - puts '* Generating Self Signed Certificate Request' - tf = Tempfile.new("#{fqdn}.ssl-conf") - ssl_config = < #{fqdn}.crt)") - sh("(cd #{CADIR} && openssl x509 -noout -fingerprint -text < #{fqdn}.crt > #{fqdn}.info)") - sh("(cd #{CADIR} && cat #{fqdn}.crt #{fqdn}.key > #{fqdn}.pem)") - sh("(cd #{CADIR} && chmod 644 #{fqdn}.pem)") +# Rspec and ChefSpec +desc 'Run ChefSpec examples' +RSpec::Core::RakeTask.new(:spec) + +# Integration tests. Kitchen.ci +namespace :integration do + desc 'Run Test Kitchen with Vagrant' + task :vagrant do + Kitchen.logger = Kitchen.default_file_logger + Kitchen::Config.new.instances.each do |instance| + instance.test(:always) + end + end end + +# Default +task default: %w(style spec) diff --git a/chefignore b/chefignore index 75d2251..a976917 100644 --- a/chefignore +++ b/chefignore @@ -1,5 +1,5 @@ # Put files/directories that should be ignored in this file when uploading -# or sharing to the community site. +# to a chef-server or supermarket. # Lines that start with '# ' are comments. # OS generated files # @@ -54,8 +54,13 @@ features/* examples/* Guardfile Procfile -test/* +.kitchen* +.rubocop.yml spec/* +Rakefile +.travis.yml +.foodcritic +.codeclimate.yml # SCM # ####### @@ -79,8 +84,10 @@ tmp # Cookbooks # ############# -CONTRIBUTING +CONTRIBUTING* CHANGELOG* +TESTING* +MAINTAINERS.toml # Strainer # ############ @@ -93,7 +100,3 @@ Strainerfile ########### .vagrant Vagrantfile - -# Travis # -########## -.travis.yml