From 0250f57b821619bba2cb25fdc16f90ac34cab2f0 Mon Sep 17 00:00:00 2001 From: Tech SOGEECOM Date: Wed, 29 Jun 2016 12:00:21 -0400 Subject: use the same style for all the examples --- README.md | 56 +++++++++++++------------------------------------------- 1 file changed, 13 insertions(+), 43 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 41a9aeb..695a824 100644 --- a/README.md +++ b/README.md @@ -49,10 +49,6 @@ Ubuntu support is lagging behind but not absent either. ## Upgrade Notice - * The default value of the `$repos` parameter was removed since the logic is - now in the `apt::params` class. If you have explicitly set `$repos` to - 'auto' in your manifests, you should remove this. - * The `disable_update` parameter has been removed. The main apt class defaults to *not* run an `apt-get update` on every run anyway so this parameter seems useless. @@ -83,10 +79,9 @@ Ubuntu support is lagging behind but not absent either. you will need to remove the variables, and the include and instead do the following: - class { - 'apt': - debian_url => 'http://localhost:9999/debian/', - use_next_release => true; + class { 'apt': + debian_url => 'http://localhost:9999/debian/', + use_next_release => true; } previously, you could manually set `$lsbdistcodename` which would enable forced @@ -98,10 +93,9 @@ Ubuntu support is lagging behind but not absent either. you to trigger upgrades: include apt::dist_upgrade - class { - 'apt': - codename => 'wheezy', - notify => Exec['apt_dist-upgrade']; + class { 'apt': + codename => 'wheezy', + notify => Exec['apt_dist-upgrade']; } * the `apticron` class has been moved to a parameterized class. if you were @@ -116,8 +110,7 @@ Ubuntu support is lagging behind but not absent either. you will need to remove the variables, and the include and instead do the following: - class { - 'apt::apticron': + class { 'apt::apticron': email => 'foo@example.com', notifynew => '1'; } @@ -134,9 +127,8 @@ Ubuntu support is lagging behind but not absent either. you will need to remove the variables, and the include and instead do the following: - class { - 'apt::listchanges': - email => 'foo@example.com'; + class { 'apt::listchanges': + email => 'foo@example.com'; } * the `apt::proxy_client` class has been moved to a paramterized class. if you @@ -151,10 +143,9 @@ Ubuntu support is lagging behind but not absent either. you will need to remove the variables, and the include and instead do the following: - class { - 'apt::proxy_client': - proxy => 'http://proxy.domain', - port => '666'; + class { 'apt::proxy_client': + proxy => 'http://proxy.domain', + port => '666'; } @@ -644,33 +635,11 @@ To run pupept rspec tests: bundle install --path vendor/bundle bundle exec rake spec -Verbose Output: - - bundle exec rake spec SPEC_OPTS='--format documentation' - Using different facter/puppet versions: FACTER_GEM_VERSION=1.6.10 PUPPET_GEM_VERSION=2.7.23 bundle install --path vendor/bundle bundle exec rake spec -## Acceptance Tests - -At the moment, we use [beaker together with docker](https://github.com/puppetlabs/beaker/blob/master/docs/Docker-Support.md) -to do acceptance testing. -Be sure to have a recent docker version installed. - -List configured nodesets: - - bundle exec rake beaker_nodes - -Run tests on default node (Debian Jessie): - - bundle exec rake beaker - -Run different nodeset: - - BEAKER_set="debian-8-x86_64-docker" bundle exec rspec spec/acceptance/*_spec.rb - # Licensing @@ -681,3 +650,4 @@ The GPL version 3 license text can be found in the "LICENSE" file accompanying this puppet module, or at the following URL: http://www.gnu.org/licenses/gpl-3.0.html + -- cgit v1.2.3 From eedc5eef88f19e83581742d305af82ae27a6fad5 Mon Sep 17 00:00:00 2001 From: Tech SOGEECOM Date: Wed, 29 Jun 2016 12:01:18 -0400 Subject: fix :key: in Gitlab markdown --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 695a824..6ad05de 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ * [apt::preseeded_package](#apt-preseeded_package) * [apt::sources_list](#apt-sources_list) * [apt::key](#apt-key) - * [apt::key::plain](#apt-key-plain) + * [`apt::key::plain`](#apt-key-plain) * [apt::upgrade_package](#apt-upgrade_package) * [Resources](#ressources) * [File\['apt_config'\]](#fileapt_config) @@ -558,7 +558,7 @@ use `apt::key::plain`. The `.gpg` extension is compulsory for `apt` to pickup the key properly. -## apt::key::plain +## `apt::key::plain` Deploys a secure apt OpenPGP key. This usually accompanies the sources.list snippets above for third party repositories. For example, -- cgit v1.2.3 From 419f9e460113d31e0d3d7c95ede5e41e7918d2bf Mon Sep 17 00:00:00 2001 From: Tech SOGEECOM Date: Wed, 29 Jun 2016 13:42:41 -0400 Subject: add back the parts of the README that were lost --- README.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'README.md') diff --git a/README.md b/README.md index 6ad05de..940e533 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ * [File\['apt_config'\]](#fileapt_config) * [Exec\['apt_updated'\]](#execapt_updated) * [Tests](#tests) + * [Acceptance Tests](#acceptance-tests) * [Licensing](#licensing) @@ -49,6 +50,10 @@ Ubuntu support is lagging behind but not absent either. ## Upgrade Notice + * The default value of the `$repos` parameter was removed since the logic is + now in the `apt::params` class. If you have explicitly set `$repos` to + 'auto' in your manifests, you should remove this. + * The `disable_update` parameter has been removed. The main apt class defaults to *not* run an `apt-get update` on every run anyway so this parameter seems useless. @@ -635,11 +640,33 @@ To run pupept rspec tests: bundle install --path vendor/bundle bundle exec rake spec +Verbose Output: + + bundle exec rake spec SPEC_OPTS='--format documentation' + Using different facter/puppet versions: FACTER_GEM_VERSION=1.6.10 PUPPET_GEM_VERSION=2.7.23 bundle install --path vendor/bundle bundle exec rake spec +## Acceptance Tests + +At the moment, we use [beaker together with docker](https://github.com/puppetlabs/beaker/blob/master/docs/Docker-Support.md) +to do acceptance testing. +Be sure to have a recent docker version installed. + +List configured nodesets: + + bundle exec rake beaker_nodes + +Run tests on default node (Debian Jessie): + + bundle exec rake beaker + +Run different nodeset: + + BEAKER_set="debian-8-x86_64-docker" bundle exec rspec spec/acceptance/*_spec.rb + # Licensing -- cgit v1.2.3 From 5a7336ad479ce98877b80f901863f253c0b74a1d Mon Sep 17 00:00:00 2001 From: Tech SOGEECOM Date: Wed, 29 Jun 2016 13:55:29 -0400 Subject: fix formatting errors --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 940e533..a77026f 100644 --- a/README.md +++ b/README.md @@ -642,7 +642,7 @@ To run pupept rspec tests: Verbose Output: - bundle exec rake spec SPEC_OPTS='--format documentation' + bundle exec rake spec SPEC_OPTS='--format documentation' Using different facter/puppet versions: @@ -657,15 +657,15 @@ Be sure to have a recent docker version installed. List configured nodesets: - bundle exec rake beaker_nodes + bundle exec rake beaker_nodes Run tests on default node (Debian Jessie): - bundle exec rake beaker + bundle exec rake beaker Run different nodeset: - BEAKER_set="debian-8-x86_64-docker" bundle exec rspec spec/acceptance/*_spec.rb + BEAKER_set="debian-8-x86_64-docker" bundle exec rspec spec/acceptance/*_spec.rb # Licensing @@ -677,4 +677,3 @@ The GPL version 3 license text can be found in the "LICENSE" file accompanying this puppet module, or at the following URL: http://www.gnu.org/licenses/gpl-3.0.html - -- cgit v1.2.3 From 05ca5b0a05d1ac38bb61d42f06b61a230060520f Mon Sep 17 00:00:00 2001 From: Tech SOGEECOM Date: Wed, 29 Jun 2016 13:59:51 -0400 Subject: ident the upgrade notices correctly --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index a77026f..83a7ec9 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Ubuntu support is lagging behind but not absent either. ## Upgrade Notice - * The default value of the `$repos` parameter was removed since the logic is + * The default value of the `$repos` parameter was removed since the logic is now in the `apt::params` class. If you have explicitly set `$repos` to 'auto' in your manifests, you should remove this. @@ -77,8 +77,8 @@ Ubuntu support is lagging behind but not absent either. instantiating the class with those variables instead. For example, if you had the following in your manifests: - $apt_debian_url = 'http://localhost:9999/debian/' - $apt_use_next_release = true + $ apt_debian_url = 'http://localhost:9999/debian/' + $ apt_use_next_release = true include apt you will need to remove the variables, and the include and instead do -- cgit v1.2.3 From 8723519f0fec46fb39a99ae7c57581271e532322 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 29 Jun 2016 18:21:19 +0000 Subject: Fix newly introduced white-space issues. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 83a7ec9..41194e1 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,8 @@ Ubuntu support is lagging behind but not absent either. ## Upgrade Notice * The default value of the `$repos` parameter was removed since the logic is - now in the `apt::params` class. If you have explicitly set `$repos` to - 'auto' in your manifests, you should remove this. + now in the `apt::params` class. If you have explicitly set `$repos` to + 'auto' in your manifests, you should remove this. * The `disable_update` parameter has been removed. The main apt class defaults to *not* run an `apt-get update` on every run anyway so this @@ -77,8 +77,8 @@ Ubuntu support is lagging behind but not absent either. instantiating the class with those variables instead. For example, if you had the following in your manifests: - $ apt_debian_url = 'http://localhost:9999/debian/' - $ apt_use_next_release = true + $apt_debian_url = 'http://localhost:9999/debian/' + $apt_use_next_release = true include apt you will need to remove the variables, and the include and instead do -- cgit v1.2.3 From bc73809d7b33541b50ba9f38cb3bf1dd2237b98f Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 29 Jun 2016 18:21:30 +0000 Subject: Try to fix rendering of Markdown pre-formatted sections in bullet lists. --- README.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 41194e1..c0d5f85 100644 --- a/README.md +++ b/README.md @@ -77,9 +77,9 @@ Ubuntu support is lagging behind but not absent either. instantiating the class with those variables instead. For example, if you had the following in your manifests: - $apt_debian_url = 'http://localhost:9999/debian/' - $apt_use_next_release = true - include apt + $apt_debian_url = 'http://localhost:9999/debian/' + $apt_use_next_release = true + include apt you will need to remove the variables, and the include and instead do the following: @@ -107,10 +107,10 @@ Ubuntu support is lagging behind but not absent either. including this class before, you will need to move to instantiating the class instead. For example, if you had the following in your manifests: - $apticron_email = 'foo@example.com' - $apticron_notifynew = '1' - ... any $apticron_* variables - include apticron + $apticron_email = 'foo@example.com' + $apticron_notifynew = '1' + ... any $apticron_* variables + include apticron you will need to remove the variables, and the include and instead do the following: @@ -125,9 +125,9 @@ Ubuntu support is lagging behind but not absent either. to move to instantiating the class with those variables instead. For example, if you had the following in your manifests: - $apt_listchanges_email = 'foo@example.com' - ... any $apt_listchanges_* variables - include apt::listchanges + $apt_listchanges_email = 'foo@example.com' + ... any $apt_listchanges_* variables + include apt::listchanges you will need to remove the variables, and the include and instead do the following: @@ -141,17 +141,17 @@ Ubuntu support is lagging behind but not absent either. to move to instantiating the class with those variables instead. For example, if you had the following in your manifests: - $apt_proxy = 'http://proxy.domain' - $apt_proxy_port = 666 - include apt::proxy_client + $apt_proxy = 'http://proxy.domain' + $apt_proxy_port = 666 + include apt::proxy_client you will need to remove the variables, and the include and instead do the following: - class { 'apt::proxy_client': - proxy => 'http://proxy.domain', - port => '666'; - } + class { 'apt::proxy_client': + proxy => 'http://proxy.domain', + port => '666'; + } # Requirements -- cgit v1.2.3