Commit 58103ed4 authored by mh's avatar mh

Merge remote-tracking branch 'varac/master'

Conflicts:
	files/boilerplate/providers.footer
	files/boilerplate/providers.header
	manifests/base.pp
	manifests/providers.pp
parents 2f388687 faf6fba9
#LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# For additional information, see http://shorewall.net/MultiISP.html # For additional information, see http://shorewall.net/MultiISP.html
# #
############################################################################################ ############################################################################################
#NAME NUMBER MARK DUPLICATE INTERFACE GATEWAY OPTIONS COPY #NAME NUMBER MARK DUPLICATE INTERFACE GATEWAY OPTIONS COPY
#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
#
# Shorewall version 4 - route rules File
#
# For information about entries in this file, type "man shorewall-rtrules"
#
# For additional information, see http://www.shorewall.net/MultiISP.html
####################################################################################
# SOURCE DEST PROVIDER PRIORITY MASK
...@@ -63,4 +63,7 @@ class shorewall( ...@@ -63,4 +63,7 @@ class shorewall(
# See http://www.shorewall.net/manpages/shorewall-tunnels.html # See http://www.shorewall.net/manpages/shorewall-tunnels.html
shorewall::managed_file { tunnel: } shorewall::managed_file { tunnel: }
shorewall::managed_file { rtrules: }
shorewall::managed_file { providers: }
} }
# manage providers
define shorewall::providers( define shorewall::providers(
$provider, $provider = $name,
$number = '', $number = '',
$mark = '', $mark = '',
$duplicate = 'main', $duplicate = 'main',
$interface = '', $interface = '',
$gateway = '', $gateway = '',
$options = '', $options = '',
$copy = '', $copy = '',
$order='100' $order = '100'
){ ){
shorewall::entry{"providers-${order}-${name}": shorewall::entry{"providers-${order}-${name}":
line => "# ${name}\n${provider} ${number} ${mark} ${duplicate} ${interface} ${gateway} ${options} ${copy}" line => "# ${name}\n${provider} ${number} ${mark} ${duplicate} ${interface} ${gateway} ${options} ${copy}"
} }
} }
define shorewall::rtrules(
$source = '-',
$destination = '-',
$provider,
$priority = '10000',
$mark,
){
shorewall::entry { "rtrules.d/${mark}-${title}":
line => "# ${name}\n${source} ${destination} ${provider} ${priority} ${mark}",
}
}
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