Commit 29c3c851 authored by Francois Deppierraz's avatar Francois Deppierraz
Browse files

postix-ng -> postfix

find . -type f -exec perl -pi -e 's/postfix-ng/postfix/' {} \;
parent 8157cc71
include postfix-ng
include postfix
postfix-ng::config { "relay_domains": value => "localhost host.foo.com" }
postfix::config { "relay_domains": value => "localhost host.foo.com" }
class postfix-ng::mailman {
class postfix::mailman {
$postfix_ng_smtp_listen = "0.0.0.0"
include postfix-ng
include postfix
postfix-ng::config {
postfix::config {
"mydestination": value => "";
"virtual_alias_maps": value => "hash:/etc/postfix/virtual";
"transport_maps": value => "hash:/etc/postfix/transport";
"mailman_destination_recipient_limit": value => "1", nonstandard => true;
}
postfix-ng::hash { "/etc/postfix/virtual":
postfix::hash { "/etc/postfix/virtual":
ensure => present,
}
postfix-ng::hash { "/etc/postfix/transport":
postfix::hash { "/etc/postfix/transport":
ensure => present,
}
......
......@@ -7,7 +7,7 @@
# A valid relay host is required ($postfix_relayhost) for outbound email.
#
# transport & virtual maps get configured and can be populated with
# postfix-ng::transport and postfix-ng::virtual
# postfix::transport and postfix::virtual
#
# Example:
#
......@@ -16,16 +16,16 @@
# $postfix_ng_smtp_listen = "0.0.0.0"
# $postfix_mydestination = "\$myorigin, myapp.example.com"
#
# include postfix-ng::mta
# include postfix::mta
#
# postfix-ng::transport { "myapp.example.com":
# postfix::transport { "myapp.example.com":
# ensure => present,
# destination => "local:",
# }
# }
#
class postfix-ng::mta {
class postfix::mta {
case $postfix_relayhost {
"": { fail("Required \$postfix_relayhost variable is not defined.") }
......@@ -35,9 +35,9 @@ class postfix-ng::mta {
"": { $postfix_mydestination = "\$myorigin" }
}
include postfix-ng
include postfix
postfix-ng::config {
postfix::config {
"mydestination": value => $postfix_mydestination;
"mynetworks": value => "127.0.0.0/8";
"relayhost": value => $postfix_relayhost;
......@@ -45,11 +45,11 @@ class postfix-ng::mta {
"transport_maps": value => "hash:/etc/postfix/transport";
}
postfix-ng::hash { "/etc/postfix/virtual":
postfix::hash { "/etc/postfix/virtual":
ensure => present,
}
postfix-ng::hash { "/etc/postfix/transport":
postfix::hash { "/etc/postfix/transport":
ensure => present,
}
......
......@@ -6,7 +6,7 @@
# $valid_fqdn can be set to override $fqdn in the case where the FQDN is
# not recognized as valid by the destination server.
#
# All other parameters for postfix-ng::mta are valid.
# All other parameters for postfix::mta are valid.
#
# Example:
#
......@@ -15,10 +15,10 @@
# $valid_fqdn = "toto.example.com"
# $root_mail_recipient = "the.sysadmin@example.com"
#
# include postfix-ng::satellite
# include postfix::satellite
# }
class postfix-ng::satellite {
class postfix::satellite {
# If $fake_fqdn exists, use it to override $fqdn
case $valid_fqdn {
......@@ -26,9 +26,9 @@ class postfix-ng::satellite {
default: { $fqdn = "${valid_fqdn}" }
}
include postfix-ng::mta
include postfix::mta
postfix-ng::virtual {"@${valid_fqdn}":
postfix::virtual {"@${valid_fqdn}":
ensure => present,
destination => "root",
}
......
......@@ -4,7 +4,7 @@
# delivery and an SMTP server listening on the loopback interface.
#
class postfix-ng {
class postfix {
# Default value for various options
case $postfix_ng_smtp_listen {
......@@ -52,8 +52,8 @@ class postfix-ng {
file { "/etc/postfix/master.cf":
ensure => present,
content => $lsbdistcodename ? {
Tikanga => template("postfix-ng/master.cf.redhat5.erb"),
etch => template("postfix-ng/master.cf.debian-etch.erb"),
Tikanga => template("postfix/master.cf.redhat5.erb"),
etch => template("postfix/master.cf.debian-etch.erb"),
default => "No puppet template defined for $lsbdistcodename\n",
},
notify => Service["postfix"],
......@@ -62,7 +62,7 @@ class postfix-ng {
file { "/etc/postfix/main.cf":
ensure => present,
source => "puppet:///postfix-ng/main.cf",
source => "puppet:///postfix/main.cf",
replace => false,
notify => Service["postfix"],
require => Package["postfix"],
......@@ -70,7 +70,7 @@ class postfix-ng {
# Default configuration parameters
postfix-ng::config {
postfix::config {
"myorigin": value => "${fqdn}";
"alias_maps": value => "hash:/etc/aliases";
"inet_interfaces": value => "all";
......@@ -78,7 +78,7 @@ class postfix-ng {
case $operatingsystem {
RedHat: {
postfix-ng::config {
postfix::config {
"sendmail_path": value => "/usr/sbin/sendmail.postfix";
"newaliases_path": value => "/usr/bin/newaliases.postfix";
"mailq_path": value => "/usr/bin/mailq.postfix";
......
define postfix-ng::config ($ensure = present, $value, $nonstandard = false) {
define postfix::config ($ensure = present, $value, $nonstandard = false) {
case $ensure {
present: {
exec {"postconf -e ${name}='${value}'":
......@@ -12,7 +12,7 @@ define postfix-ng::config ($ensure = present, $value, $nonstandard = false) {
}
absent: {
fail "postfix-ng::config ensure => absent: Not implemented"
fail "postfix::config ensure => absent: Not implemented"
}
}
}
define postfix-ng::hash ($ensure) {
define postfix::hash ($ensure) {
file {"${name}":
ensure => $ensure,
mode => 600,
......
define postfix-ng::transport ($ensure, $destination) {
define postfix::transport ($ensure, $destination) {
line {"${name} ${destination}":
ensure => present,
file => "/etc/postfix/transport",
......
define postfix-ng::virtual ($ensure, $destination) {
define postfix::virtual ($ensure, $destination) {
line {"${name} ${destination}":
ensure => present,
file => "/etc/postfix/virtual",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment