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
Tuomo Soini
ae7d78d75f
macro.Telnet: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:40 +02:00
Tuomo Soini
cdae111c8d
macro.Syslog: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
f36e204d4a
macro.SVN: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
078dfc38ee
macro.Submission: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
4f4ddd4809
macro.SSH: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
864659b96e
macro.Squid: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
687cd578eb
macro.SPAMD: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
d092044bdd
macro.SNMPTrap: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
d72f0a1f41
macro.SNMP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
11cf80ce98
macro.SMTPS: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
48efde89cd
macro.SMTP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
26710e72a9
macro.SMBswat: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
f8d99a0f22
macro.SMBBI: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
316f07bce9
macro.SMB: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
73aa2c68eb
macro.SixXS: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
c2b1a0ce04
macro.SIP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
3cec3ce6bc
macro.Sieve: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
a1a6352617
macro.SANE: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
a32c0c9901
macro.Rsync: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
38953df7fb
macro.RNDC: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
b960256fdb
macro.RIPbi: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
cfe2b89e2d
macro.Rfc1918: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
9d4eb3eccf
macro.Reject: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
8d13653fc2
macro.Redis: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
974e88c038
macro.RDP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
ff449953c6
macro.Rdate: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
e5818fb9d8
macro.Razor: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
29b30f29a0
macro.QUIC: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
feaadcd8f8
macro.Puppet: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
71681d1ccd
macro.Printer: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
c9161a3eb2
macro.PPtP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
2c2c4194ce
macro.PostgreSQL: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
5cda192731
macro.POP3S: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
9b6f8d2f0c
macro.POP3: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
c25ddcea40
macro.Ping: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
5667919b91
macro.PCA: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
4f340e7033
macro.OSPF: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
724f21202c
macro.OpenVPN: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
efa019a782
macro.NTPbrd: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
2612e012d6
macro.NTPbi: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
2420f24a62
macro.NTP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
688ba42a57
macro.NNTPS: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
9bf7bb73f9
macro.NNTP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
897337acef
macro.MySQL: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
f447e5f3ce
macro.Munin: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
2208dc85c6
macro.MSSQL: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
bb558baf23
macro.MSNP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
f16a7d6224
macro.MongoDB: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
a4c88ee966
macro.mDNSbi: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
996b629029
macro.mDNS: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
d732a8a040
macro.Mail: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
ce6532ebfb
macro.LDAPS: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
a82e517d05
macro.LDAP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
ccd1f3b9d3
macro.L2TP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
9b45c81dc6
macro.Kerberos: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
d9907e93e8
macro.Jetdirect: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
6222ec1e1a
macro.JAP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
9b2bc4f53d
macro.JabberSecure: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
e99b23c154
macro.JabberPlain: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
3a9979fb3d
macro.Jabberd: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
4ed88eb4ad
macro.Jabber: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
d890a840d4
macro.IRC: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
8c9c96c8d7
macro.IPsecnat: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
0718bebf6f
macro.IPsecah: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
f7a9d7dc4d
macro.IPsec: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
9ce2df55d1
macro.IPPserver: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
42438c817a
macro.IPPbrd: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
e08079cc1b
macro.IPP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
e49494bbe4
macro.IPMI: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
5496eacfa7
macro.IPIP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
ce2cf9e9f6
macro.IMAPS: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
4f36f96163
macro.IMAP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
db62969526
macro.ILO: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
89bf8332be
macro.ICQ: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
f516a07f08
macro.ICPV2: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
e4982e6919
macro.HTTPS: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:39 +02:00
Tuomo Soini
4289d0a2c0
macro.HTTP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
696996c8de
macro.HKP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
336518e24b
macro.GRE: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
6a73b5bc87
macro.Goto-Meeting: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
536b5c4cfc
macro.Gnutella: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
3b039c0cf0
macro.GNUnet: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
77a1d03435
macro.Git: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
5985ab2f88
macro.FTP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
26d1896d81
macro.Finger: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
2622489f36
macro.Edonkey: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
a12225047c
macro.DropUPnP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
c0d1cbd4ca
macro.DropDNSrep: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
71df5b5042
macro.Drop: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
8bb0fd93df
macro.DNS: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
934fa78228
macro.Distcc: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
a881d663be
macro.DHCPfwd: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
848cb5954d
macro.DCC: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
f09d93a5a6
macro.DAAP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
ff5c3eba5a
macro.CVS: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
3ac875a66c
macro.Citrix: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
af1d90368e
macro.BLACKLIST: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
5075e298dc
macro.BitTorrent32: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
231b12b520
macro.BitTorrent: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
016978eab5
macro.BGP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
2cea162713
macro.Auth: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
84caee9a3e
macro.AMQP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
6888195ce6
macro.Amanda: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
538600d389
macro.AllowICMPs: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
bc34b49905
macro.A_DropUPnP: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
e4a4fb25f1
macro.A_DropDNSrep: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
a883a0720c
macro.ActiveDir: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
4a3e168476
macro.A_AllowICMPs: update macro header and description
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:20:38 +02:00
Tuomo Soini
7b4c4fb30d
macro.MSA: Add as alias for Submission
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 18:19:11 +02:00
Tuomo Soini
daa016d2a3
Shorewall[6]/Makefile: remove extra restore, shorewall does that automatically
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-12 18:17:46 +02:00
Tuomo Soini
b57c02e0ed
shorewall/Makefile: fix logics so you get error from reload
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-12 12:19:25 +02:00
Tom Eastep
a219778aa3
Correct macro indentation
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-09 18:20:12 -08:00
Tom Eastep
8ac0f96029
Delete blank line
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-09 18:20:00 -08:00
Tom Eastep
894a98f24e
Improve optimizer handling of origin during rule merge
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-04 12:00:05 -08:00
Tom Eastep
bd9e8142b9
Ensure that the chain origin is used when there is no rule origin
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-03 10:43:10 -08:00
Tom Eastep
916a392fb0
Improve chain-completion rule tracking
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-02 14:57:47 -08:00
Tom Eastep
28983a0194
Add comment describing the origin member of a rule
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-31 09:29:24 -08:00
Tom Eastep
2cd098ba31
Update heading versions and copyrights
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-28 13:46:34 -08:00
Tom Eastep
9188f7efa3
Don't export shortlineinfo2
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-28 13:38:26 -08:00
Tom Eastep
95a029316a
Improve get_keys*()
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-28 12:51:23 -08:00
Tom Eastep
d4bea3d3ec
Optimize TRACK_RULES handling in the Chains module
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-28 11:38:48 -08:00
Tom Eastep
6085c6092f
Add origin comments to command-mode rules
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-28 10:58:09 -08:00
Tom Eastep
48df3d9627
Add origin member to the providers table
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-28 10:34:36 -08:00
Tom Eastep
94442abfcf
Correct check for duplicate interface in providers
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-28 10:34:16 -08:00
Tom Eastep
86f2e23f33
Invoke add_irule_extended rather than a hack that predated that function
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-27 19:01:23 -08:00
Tom Eastep
6e9d5f45ec
Avoid spurious comment in jump to interface option chains.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-27 16:50:03 -08:00
Tom Eastep
039fd6ddd8
Move origin handling into log_[i]rule_limit
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-27 14:24:56 -08:00
Tom Eastep
57288086bf
Unify TRACK_RULES handling
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-27 12:55:21 -08:00
Tom Eastep
f999acda63
Eliminate shortlineinfo1()
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-27 10:21:08 -08:00
Tom Eastep
b4723da07c
Eliminate $globals{TRACK_GLOBALS}
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-26 16:45:47 -08:00
Tom Eastep
3860a1dc72
Ensure that %origin is populated
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-26 16:31:04 -08:00
Tom Eastep
e756820ca1
Revert "Unify TRACK_RULES settings implementation"
...
This reverts commit 866cb04cbb
.
2016-01-26 11:49:26 -08:00
Tom Eastep
866cb04cbb
Unify TRACK_RULES settings implementation
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-25 18:07:46 -08:00
Tom Eastep
6ef136a546
Add origin information for entries in shorewall[6].conf
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-25 15:49:18 -08:00
Tom Eastep
9b3b4579a2
Change TRACK_RULES setting from Internal to File
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-24 16:15:36 -08:00
Tom Eastep
3e404b765f
Make .ip[6]tables-restore-input comments conditional
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-23 17:04:52 -08:00
Tom Eastep
2235641c9f
Add origin to the ip[6]tables input.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-23 15:13:12 -08:00
Tom Eastep
3fe4619f66
Fix origin in interfaces and hosts
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-23 13:49:52 -08:00
Tom Eastep
247698a14d
Add origin in some rules from the Misc module
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-23 12:31:53 -08:00
Tom Eastep
73b20c832c
Add 'origin' member to rules
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-23 10:45:26 -08:00
Tom Eastep
8ac754caed
Add 'origin' member to the interface and hosts tables
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-21 17:08:19 -08:00
Matt Darfeuille
c85ced09af
Corrected sysconfig files
...
Removed unnecessary lines in sysconfig files
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-19 09:25:37 -08:00
Tom Eastep
1abb77d66d
Remove restrictions on -m geoip
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-18 22:30:15 -08:00
Tom Eastep
a28f3012d5
Correct $VERSION setting in Raw.pm
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-18 09:38:35 -08:00
Tom Eastep
7d443b5e2e
Eliminate return value from process_action()
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-18 09:08:35 -08:00
Tom Eastep
a945b3e0dd
Tweak the process_action() changes
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-17 17:03:46 -08:00
Tom Eastep
ec6c233666
Centralize Rules module handling of @CALLER in actions
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-17 16:29:35 -08:00
Tom Eastep
4059e9de95
Clean up use_policy_action()
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-17 12:35:12 -08:00
Tom Eastep
1ee645cd79
Another determinism fix -- red and codel options are now sorted
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-17 09:50:34 -08:00
Tom Eastep
1fedb26f1d
Handle @CALLER in policy chains
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-17 09:42:01 -08:00
Tom Eastep
031371f259
Improve maintainability of action-tuple code
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-16 17:26:16 -08:00
Tom Eastep
742c15b289
Improve @CALLER fix to create unique chains per caller
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-16 17:12:03 -08:00
Tom Eastep
f95c67ec6b
Restore unmodified .pm files after installation
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-15 13:55:46 -08:00
matt darfeuille
f1ed963077
Shorewall 5.0.4 Beta 2
...
Hi Tom,
Some unnecessary lines need to be removed from the sysconfig files.
I made some more changes to the init.openwrt.sh scripts(lite and
lite6)
Attached as sysconfig-lite.patch!
In order to be able to use the build50 script I had to make a few
changes(attached as build50.patch):
- Adding a variable BASEDIR (to build shorewall in a subdirectory)
BASEDIR=$PWD
and doing:
$BASEDIR/annotate.pl
and so on ...
- Adding a variable
CYGWINSTYLESHEET
and modifying the script to use this new variable(added cygwin clause
in case statement)
- Adding a variable GITRELEASEDIR and modifying the lines around
624(to specify an other name for the release repo)
from
../release/
to
../$GITRELEASEDIR/
- Added line to remove unnecessary *.bak files
- Added an if statement if a subdirectory is used when patches are
created
question/request:
Would it be possible to use the build50 script without the '-t'
option?
That way only the packages would be built but the tarballs wouldn't
be created.
-Matt
On 12 Jan 2016 at 7:57, Tom Eastep wrote:
> Shorewall 5.0.4 Beta 2 is now available for download.
>
> New Feature since Beta 1:
>
> 1) The mangle file now supports an DIVERTHA action that provides
> support for HAProxy.
>
> To setup the HAProxy transparent configuration described at
>
> http://www.loadbalancer.org/blog/setting-up-haproxy-with-transparent-mode-on-centos-6-x ,
> place this entry in shorewall-providers(5):
>
>
> #NAME NUMBER MARK DUPLICATE INTERFACE GATEWAY OPTIONS
> TProxy 1 - - lo - tproxy
>
> and use this DIVERTHA entry:
>
> #ACTION SOURCE DEST PROTO ...
> DIVERTHA - - tcp
>
> Thank you for testing,
> -Tom
> --
> Tom Eastep \ When I die, I want to go like my Grandfather who
> Shoreline, \ died peacefully in his sleep. Not screaming like
> Washington, USA \ all of the passengers in his car
> http://shorewall.net \________________________________________________
>
>
-------------- Enclosure number 1 ----------------
>From ca4c854433e1c4c5870ea3e71225e5df8da4e255 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <matdarf@gmail.com>
Date: Wed, 13 Jan 2016 21:28:47 +0100
Subject: [PATCH 1/2] Modified lite and lite6.init.openwrt.sh
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-14 16:36:21 -08:00
Tom Eastep
726d1492cd
Correct error message
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-13 17:08:57 -08:00
Tom Eastep
12513e24a3
Revert "Implement dynamic actions"
...
This reverts commit 8075ba719a
.
2016-01-13 11:04:41 -08:00
Tom Eastep
21765d618d
Create unique chains when @caller is used
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-13 11:04:23 -08:00
Tom Eastep
de21c59885
Correct hashlimit in logging rules
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-13 09:49:22 -08:00
Tom Eastep
8075ba719a
Implement dynamic actions
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-13 09:33:38 -08:00
Tom Eastep
3828eb856b
Rename HADIVERT to DIVERTHA
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-08 15:36:10 -08:00
Tom Eastep
e29e2d117d
Documentation updates
...
- update LSM section of the Multi-ISP article
- Correct formatting of HAPROXY examples
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-08 08:33:42 -08:00
Tom Eastep
ad2f20b824
Finish HAProxy support
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-06 09:12:33 -08:00
Tom Eastep
4c33c2b957
Add support for HAProxy
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-06 08:27:50 -08:00
Tom Eastep
ee6a1dadbb
Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code
2016-01-05 10:48:48 -08:00
Tom Eastep
2f59ea5ca3
Implement the WAIT_OPTION capability
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-05 09:28:24 -08:00
Tuomo Soini
c447ddd03e
systemd service: rename pre214 systemd versions to pre214 and remove separeate 214 variants
2016-01-05 12:01:21 +02:00
Tom Eastep
0c66e5f1b2
More Openwrt support in Shorewall-init from Matt Darfeuille
...
- Also, various cleanup in install/uninstall scripts
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-04 15:45:21 -08:00
Tom Eastep
e695e08009
A couple of corrections to the IP[6]TABLE transparency change
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-04 14:13:58 -08:00
Tom Eastep
c91b78a875
Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code
2016-01-04 13:10:48 -08:00
Tom Eastep
70a9240de6
Make IP[6]TABLES transparent
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-04 13:10:03 -08:00