Commit Graph

6848 Commits

Author SHA1 Message Date
Tom Eastep
8a02624f05 Update copyrights in the install and uninstall scripts
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-29 11:03:09 -08:00
Tom Eastep
1c1881859f Delete untrue comment
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-29 08:45:47 -08:00
Tom Eastep
5b163e9bc2 Save/restore docker0 rules when it isn't defined to Shorewall
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-27 14:09:29 -08:00
Tom Eastep
71d64ab380 Add DOCKER network support
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-27 13:36:47 -08:00
Tom Eastep
36d8518562 Code compaction
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-26 13:13:56 -08:00
Tom Eastep
6c88eb6916 Add an ECN action to shorewall-mangle(8)
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-26 09:33:16 -08:00
Tom Eastep
6e1cc0f1d0 Correct stop/start Docker handling
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-25 13:37:44 -08:00
Tom Eastep
ee5ef07035 Correct another silly typo -- this time in allowBcast()
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-24 14:58:10 -08:00
Tom Eastep
3c8696b91d Correct silly typo in setup_ecn()
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-24 09:35:13 -08:00
Tom Eastep
fd4de0c66a Create more compact DOCKER conditional rules
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-22 14:46:35 -08:00
Tom Eastep
49536562e2 Emit more compact code when conditionally adding DOCKER chains
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-22 13:49:22 -08:00
Tom Eastep
36b6863b02 Update copyright date on lib.core
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-22 13:48:48 -08:00
Tom Eastep
6a8e280483 Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2016-02-21 12:59:10 -08:00
Tom Eastep
63b501996e Require ADDRTYPE for DOCKER=Yes
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-21 12:26:39 -08:00
Tom Eastep
7a9e9ad945 Decommit DOCKER=Yes in IPv6.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-21 12:03:41 -08:00
Tom Eastep
f4312a38b9 Add all Docker rules in the stopped state
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-21 10:33:45 -08:00
Tom Eastep
fc6a1f6d0d Don't create Docker chains/rules if Docker isn't running
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-21 09:54:37 -08:00
Tom Eastep
83b899b030 Save/Restore Docker-generated rules
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-20 14:02:54 -08:00
Tom Eastep
61f6cacc30 Infrastructure required by Docker
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-20 14:01:48 -08:00
Tom Eastep
caba1cd770 DOCKER=Yes requires IPTABLES_S
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-20 10:03:06 -08:00
Tom Eastep
4306ff1029 Correct 'save_dynamic_chains'
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-20 09:57:11 -08:00
Tom Eastep
663f82c158 Move nat POSTROUTING rules to SHOREWALL if DOCKER=Yes
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-20 09:24:06 -08:00
Tuomo Soini
b39639e1f2 macro.SNMPtrap: fix file name to use common naming
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-20 18:45:55 +02:00
Tom Eastep
e66d9f6547 Add DOCKER option
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-19 17:42:54 -08:00
Tom Eastep
f33f333937 Make 'default' and 'none' case insensitive in the GATEWAY column
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-17 15:25:46 -08:00
Tom Eastep
5fc242f760 Use new column names in action.template
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-17 15:13:42 -08:00
Tom Eastep
94cfe54f92 Allow routing tables with no default route
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-17 11:49:09 -08:00
Tuomo Soini
32cd6eaa8a macro.Web: remove duplicate "This macro"
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 21:12:57 +02:00
Tuomo Soini
4e4f54a6cd macro.MDNS: fix header to show only one line in "shorewall show macros"
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 21:09:25 +02:00
Tuomo Soini
ea71679631 macro.JAP: fix comment text to work properly for "shorewall show macros"
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 21:06:40 +02:00
Tuomo Soini
5c7cba676b macro.Mail: use new MSA macro
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 20:17:24 +02:00
Tuomo Soini
c78e7635c1 macro.Trcrt: Remove extra "."
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 20:16:14 +02:00
Tuomo Soini
74cb2bea83 macro.template: update header for better screen fit
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:36:24 +02:00
Tuomo Soini
2c966d90f1 macro.Tinc: update header
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:31:41 +02:00
Tuomo Soini
6e41bc7e88 Submission: use common format for header
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:28:12 +02:00
Tuomo Soini
a86f895ae6 macro.Zabbix: update macro header and description
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:40 +02:00
Tuomo Soini
4bfa419d4d macro.Xymon: update macro header and description
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:40 +02:00
Tuomo Soini
c2e8659ba5 macro.Whois: update macro header and description
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:40 +02:00
Tuomo Soini
b2fa421933 macro.Webmin: update macro header and description
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:40 +02:00
Tuomo Soini
4ef0ebabbb macro.Webcache: update macro header and description
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:40 +02:00
Tuomo Soini
d1d0dac9ce macro.Web: update macro header and description
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:40 +02:00
Tuomo Soini
6535633fbb macro.VRRP: update macro header and description
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:40 +02:00
Tuomo Soini
d2422a1dea macro.VNCL: update macro header and description
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:40 +02:00
Tuomo Soini
6dcb1e28b4 macro.VNC: update macro header and description
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:40 +02:00
Tuomo Soini
f00f03eee3 macro.Trcrt: update macro header and description
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:40 +02:00
Tuomo Soini
a351431c62 macro.Time: update macro header and description
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:40 +02:00
Tuomo Soini
a9e354cec8 macro.TFTP: update macro header and description
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:40 +02:00
Tuomo Soini
aee6f9faa2 macro.Teredo: update macro header and description
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:40 +02:00
Tuomo Soini
c285330f25 macro.template: update macro header and description
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:40 +02:00
Tuomo Soini
bc57fedac4 macro.Telnets: update macro header and description
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:40 +02:00