From ec47dea02473c33bd937ad859b4de71b88aeb5ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
Date: Tue, 10 Mar 2015 14:07:23 +0100
Subject: [PATCH] Update
---
CONTRIBUTING.md | 8 +++++
README.md | 33 ++-----------------
.../nodesets/centos-7-x86_64-vagrant.yml | 2 +-
.../nodesets/debian-6-x86_64-vagrant.yml | 2 +-
.../nodesets/debian-7-x86_64-vagrant.yml | 3 +-
.../nodesets/ubuntu-14.04-x86_64-vagrant.yml | 10 ++++++
6 files changed, 23 insertions(+), 35 deletions(-)
create mode 100644 CONTRIBUTING.md
create mode 100644 spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..2c179eb
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,8 @@
+# How to contribute
+
+Please report bugs and feature request using [GitHub issue
+tracker](https://github.com/camptocamp/puppet-postfix/issues).
+
+For pull requests, it is very much appreciated to check your Puppet manifest
+with [puppet-lint](https://github.com/rodjek/puppet-lint) to follow the recommended Puppet style guidelines from the
+[Puppet Labs style guide](http://docs.puppetlabs.com/guides/style_guide.html).
diff --git a/README.md b/README.md
index 3672aaf..e424283 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,7 @@
-# Postfix module for Puppet
+# Postfix Puppet Module
[](https://forge.puppetlabs.com/camptocamp/postfix)
-[](https://travis-ci.org/camptocamp/puppet-postfix)
-
-**Manages Postfix configuration.**
-
-This module is provided by [Camptocamp](http://www.camptocamp.com/)
+[](https://travis-ci.org/camptocamp/puppet-postfix)
This module requires Augeas.
@@ -54,29 +50,4 @@ Manages content in the transport map.
Manages content in the virtual map.
-## Contributing
-
-Please report bugs and feature request using [GitHub issue
-tracker](https://github.com/camptocamp/puppet-postfix/issues).
-
-For pull requests, it is very much appreciated to check your Puppet manifest
-with [puppet-lint](https://github.com/camptocamp/puppet-postfix/issues) to follow the recommended Puppet style guidelines from the
-[Puppet Labs style guide](http://docs.puppetlabs.com/guides/style_guide.html).
-
-## License
-
-Copyright (c) 2013 <mailto:puppet@camptocamp.com> All rights reserved.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
index 6f02769..fe0f83b 100644
--- a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
@@ -4,7 +4,7 @@ HOSTS:
strict_variables:
platform: el-7-x86_64
hypervisor : vagrant
- box : camptocamp/centos-7-x86_64
+ box : puppetlabs/centos-7.0-64-nocm
CONFIG:
type: foss
log_level: debug
diff --git a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
index 71e8194..23dae1b 100644
--- a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
@@ -4,7 +4,7 @@ HOSTS:
strict_variables:
platform: debian-6-amd64
hypervisor : vagrant
- box : puppetlabs/debian-6.0.9-64-nocm
+ box : puppetlabs/debian-6.0.10-64-nocm
CONFIG:
type: foss
log_level: debug
diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
index 97099de..86c2165 100644
--- a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
@@ -4,8 +4,7 @@ HOSTS:
strict_variables:
platform: debian-7-amd64
hypervisor : vagrant
- box : debian-73-x64-virtualbox-nocm
- box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box
+ box : puppetlabs/debian-7.8-64-nocm
CONFIG:
type: foss
log_level: debug
diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml
new file mode 100644
index 0000000..a3edb70
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml
@@ -0,0 +1,10 @@
+HOSTS:
+ ubuntu-14.04-x64:
+ default_apply_opts:
+ strict_variables:
+ platform: ubuntu-14.04-amd64
+ hypervisor : vagrant
+ box : puppetlabs/ubuntu-14.04-64-nocm
+CONFIG:
+ type: foss
+ log_level: debug
--
GitLab