extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-30 03:23:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
14,945 Commits 104 Branches 736 Tags 55 MiB
84fa774cb7
Commit Graph

2075 Commits

Author SHA1 Message Date
Roberto C. Sánchez
8a6dcc469b
Fix typo 2016-11-21 11:59:57 -05:00
Tom Eastep
3a70185284
A couple of documentation updates 
- Anatomy
- Bridge (Perl)

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-31 11:09:06 -07:00
Tom Eastep
174f46f3e6
More snat documentation changes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-28 14:56:44 -07:00
Tom Eastep
1a06765d14
Add Bill Shirley's logging suggestions to the logging article 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-26 16:06:15 -07:00
Tom Eastep
21877d5fcb
Force a reload when enabling an interface whose IP address has changed 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-26 13:39:50 -07:00
Tom Eastep
ee8ffc3ceb
Add SNAT action example to the Actions article 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-25 10:57:32 -07:00
Tom Eastep
6e30c286c3
Reword Address Variable Warning 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-22 19:06:56 -07:00
Tom Eastep
9c749731c5
Add caution regarding Address Varibles 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-22 14:39:40 -07:00
Tom Eastep
5b5f91f75f
SNAT option documentation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-18 15:32:22 -07:00
Tom Eastep
05dbfbb988
Restrict hypen as range separator to use with integers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-16 13:26:44 -07:00
Tom Eastep
2ca86d9abd
Merge branch '5.0.13' 2016-10-16 10:22:12 -07:00
Tom Eastep
ef0253905a
More document updates for the snat file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-15 16:16:30 -07:00
Tom Eastep
026c30cfff
Update the documentation for /etc/shorewall/snat 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-15 13:52:28 -07:00
Tom Eastep
b5906812a2
Accept '-' as the separator in a port range. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-14 10:10:03 -07:00
Tom Eastep
289825a76f
Update to logging article 
- correct a typo
- recommend using NFLOG rather than ULOG
 2016-10-12 10:02:59 -07:00
Tom Eastep
0bf5ca7e0c
Rename lsm->foolsm in MultiISP article 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-07 08:01:11 -07:00
Tom Eastep
0f287dfe60
Add 'reload' to config basic document as appropriate 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-09-24 08:05:47 -07:00
Tom Eastep
ef4b1c2030
Add a TIME Columns section to the config file basics doc 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-09-22 15:45:18 -07:00
Tom Eastep
3954636fb5
Document 'comment' in the alternate input format 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-09-01 14:46:54 -07:00
Tom Eastep
d3591c071d
Correct dump instructions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-08-02 09:23:49 -07:00
Tom Eastep
65d5249bd8
Link to Digimer's article on Shorewall/REL7 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-07-07 12:44:28 -07:00
Roberto C. Sánchez
0364c15be1
Fix typos, thanks to Marco Di Cerbo for reporting them 2016-07-06 08:46:32 -04:00
Tom Eastep
094fd8129c
Update copyright and version info in the config basics doc 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-06-25 12:11:34 -07:00
Matt Darfeuille
0925636995
(Fwd) [Shorewall-users] Shorewall-lite on OpenWRT 
On 7 Jun 2016 at 8:21, Tom Eastep wrote:

> On 06/07/2016 06:40 AM, Matt Darfeuille wrote:
> > On 5 Jun 2016 at 12:53, Tom Eastep wrote:
> >
> >> On 06/05/2016 12:33 PM, Matt Darfeuille wrote:
> >>> On 5 Jun 2016 at 7:57, Tom Eastep wrote:
> >>>
> >>>> On 05/29/2016 02:00 AM, Matt Darfeuille wrote:
> >>>>
> >>>> Hi Matt,
> >>>>
> >>>>>
> >>>>> -------------- Enclosure number 1 ----------------
> >>>>> >From 6ff651108df33ab8be4562caef03a8582e9eac5e Mon Sep 17 00:00:00 2001
> >>>>> From: Matt Darfeuille <matdarf@gmail.com>
> >>>>> Date: Tue, 24 May 2016 13:10:28 +0200
> >>>>> Subject: [PATCH 1/8] Emulate 'ps -p' using grep to work on openwrt
> >>>>>
> >>>>> Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
> >>>>> ---
> >>>>>  Shorewall-core/lib.common | 2 +-
> >>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>>>>
> >>>>> diff --git a/Shorewall-core/lib.common b/Shorewall-core/lib.common
> >>>>> index 03ecb2a..fcb02ee 100644
> >>>>> --- a/Shorewall-core/lib.common
> >>>>> +++ b/Shorewall-core/lib.common
> >>>>> @@ -776,7 +776,7 @@ mutex_on()
> >>>>>  		error_message "WARNING: Stale lockfile ${lockf} removed"
> >>>>>  	    elif [ $lockpid -eq $$ ]; then
> >>>>>                  return 0
> >>>>> -	    elif ! qt ps p ${lockpid}; then
> >>>>> +	    elif ! qt ps | grep -v grep | grep ${lockpid}; then
> >>>>
> >>>> I don't see how this can work -- 'qt ps' will produce no output yet the
> >>>> code pipes into tandem greps.
> >>>>
> >>>> Do you really want this instead?
> >>>>
> >>>> elif ! ps | grep -v grep | qt grep ${lockpid}; then
> >>>>
> >>>
> >>> Oops sorry Tom, that's what I meant(do you want the corrected
> >>> patch?)!
> >>
> >> Yes, please.
> >>
> >
> > Tom, along with correcting this faulty commit I realize, after some
> > more testing, that I've also sent unnecessary commits.
> >
> > Should I revert these 3 commits(git revert ...):
> > Set proper permissions for the LOCKFILE on openwrt
> > 2ded346cb557212389212fd5adcd4c6800edbb62
> > Create lockfile before using openwrt's lock utility
> > 08e8796ff1abc3b24b8bbd40bf5e0a2b36464d61
> > Emulate 'ps -p' using grep to work on openwrt
> > 6ff651108df33ab8be4562caef03a8582e9eac5e
> >
> > or should I simply create new commits that will correct these faulty
> > commits?
> >
> > In other words what's the best way to correct submited commits.
> >
>
> Matt,
>
> Either way is fine.
>

Hopefully these 3 commits will do it(code-fixes.patch):

Patch 1 will correct the error you have point out!
On OpenWRT the lock utility doesn't allow to append the pid of the
currently running script to the LOCKFILE that's why I've simply
deleted that line(patch 2).
I've also reordered the permissions line to be added after the line
that will lock the file specified by the LOCKFILE variable(patch 3).

and two other patches:
While installing shorewall-init using the DESTDIR variable on debian,
'mkdir' would complain if the directory ${DESTDIR}/${etc}/default
already exist; corrected using 'mkdir -p ...'(patch 4).
The last patch will correct a typo in the blacklisting_support
article.

-Matt

-------------- Enclosure number 1 ----------------
>From 1a2ff15c8dc994030e819d2882570d188b99c501 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <matdarf@gmail.com>
Date: Wed, 8 Jun 2016 09:09:46 +0200
Subject: [PATCH 1/5] Correct pid detection mutex_on()

Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-06-08 15:40:48 -07:00
Tom Eastep
2809d6896c
Clarify dynamic sub-zones 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-05-18 08:20:23 -07:00
Tom Eastep
1d066bdfa4
Minor updates to the Shorewall 5 article 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-05-18 08:19:47 -07:00
Tom Eastep
590243a787 Add NFLOG as a supported mangle action 
- Also document nflog-parameters
- Correct range of nflog groups

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-05-03 11:27:34 -07:00
Tom Eastep
d959fd4445 Fix link 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-30 08:37:20 -07:00
Tom Eastep
200ad3f874 Correct typos in the Events article 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-25 09:00:45 -07:00
Tom Eastep
ab95607f5f Document ?WARNING and ?INFO 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-18 14:47:08 -07:00
Tom Eastep
549af8b402 Update config files where address and gateway variables can be used 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-15 10:51:39 -07:00
Tom Eastep
541ecb67b4 Update dhcp article 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-13 17:36:56 -07:00
Tuomo Soini
6366fb40cf ProxyARP.xml: fix proxyndp sample column matching 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-06 12:00:41 +03:00
Tom Eastep
646572098c Update IPv6 Article 
- Remove 'No NAT' bullet

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-04 12:55:37 -07:00
Tom Eastep
ebf55a84f0 Correct trace instructions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-03 12:47:28 -07:00
Tom Eastep
89adc3ea68 Use an address variable rather than find_first_interface_address() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-26 13:13:15 -07:00
Tom Eastep
8a6941707a Updates to the config basics article 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-26 09:01:02 -07:00
Tom Eastep
0b049a55e0 Correct Three-interface doc. 
- find_interface_address -> find_first_interface_address
 2016-03-25 09:34:49 -07:00
Tom Eastep
5fc391cb58 Document passed() in the config basics document 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-15 15:19:21 -07:00
Tom Eastep
a50c52675b Correct a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-12 15:08:04 -08:00
Tom Eastep
ec9148637f Inline mangle actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-09 10:28:02 -08:00
Tom Eastep
c5bb04dcb2 Add FAQ 1105 (Wifidog) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-05 14:41:30 -08:00
Tom Eastep
d4e2508a90 Clarify USE_DEFAULT_RT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-04 14:26:42 -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
64de3d0e83 Add Docker article 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-26 15:30:39 -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
f265596613 Add sample ulogd.conf file to the logging article 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-25 14:01:37 -08:00
Tom Eastep
2ee1d11f94 Cleanup of ORIGINAL DEST column references 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 12:40:36 -08:00
Tom Eastep
016acfb9de Final cleanup of PORT(S) column headings 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 12:31:53 -08:00
Tom Eastep
665381f194 Remove 'LAST LINE' anachronisms 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 12:04:32 -08:00
Tom Eastep
b6af7a0ebb Update the packet marking article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 11:16:24 -08:00
Tom Eastep
839f7f3329 Correct policy file column heading names 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 11:04:20 -08:00
Tom Eastep
0a73d365dd Update three-interface guide for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 11:02:48 -08:00
Tom Eastep
749fdfa5af Update Xen articles for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 10:46:36 -08:00
Tom Eastep
e36bf75f9f Update the whitelisting article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 10:29:41 -08:00
Tom Eastep
bc50c45e63 Update the Vserver article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 10:26:10 -08:00
Tom Eastep
9203c8a4a9 Update the VPN Basics document for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 10:23:24 -08:00
Tom Eastep
02ab9cd4ac Update the UPnP doc for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 10:19:27 -08:00
Tom Eastep
1dff1444dd Update the Universal guide for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 10:17:34 -08:00
Tom Eastep
3562a5b1bd Update the two-interface guide for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 10:17:20 -08:00
Tom Eastep
b73fb58745 Update the Traffic Shaping article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 10:17:05 -08:00
Tom Eastep
26f760b761 Update start/stop article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 09:57:15 -08:00
Tom Eastep
b95a15631c Update standalone article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 09:51:16 -08:00
Tom Eastep
60f319a718 Update Simple Bridge article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 09:46:23 -08:00
Tom Eastep
ce47ea7ec7 Update simple TC article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 09:33:19 -08:00
Tom Eastep
e60c230140 Update the Squid document for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 09:30:28 -08:00
Tom Eastep
491d55b04a Correct NAT file column heading 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 09:22:15 -08:00
Tom Eastep
ccb5f6b052 Modify the Setup Guide for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 09:20:47 -08:00
Tom Eastep
c3d005526c Update Logging article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 09:07:06 -08:00
Tom Eastep
909822230b Fix tunnels file column headings 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 09:03:09 -08:00
Tom Eastep
6cba78e89a Update Aliased Interface article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 09:02:44 -08:00
Tom Eastep
abc29f0f91 Update the Samba article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 16:25:30 -08:00
Tom Eastep
a1ad796469 Update QOS example for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 16:20:08 -08:00
Tom Eastep
c4e1cf2c2e Update the Proxy ARP article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 15:59:58 -08:00
Tom Eastep
8fd7de3900 Update the ports article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 15:57:40 -08:00
Tom Eastep
4050aa5180 Update the Port Knocking article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 15:54:32 -08:00
Tom Eastep
0e2a3f7265 Update the ping article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 15:52:29 -08:00
Tom Eastep
ed29505f67 Update the OpenVZ article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 15:50:48 -08:00
Tom Eastep
44813f75fd Update the OpenVPN article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 15:45:02 -08:00
Tom Eastep
9cae0243a5 Update NAT article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 15:21:34 -08:00
Tom Eastep
6a8a229342 Update My Network article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 15:19:06 -08:00
Tom Eastep
d88a00d0cb Update multi-zone article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 15:12:47 -08:00
Tom Eastep
477a5eb36a Update Multi-ISP doc for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 10:01:33 -08:00
Tom Eastep
4640e4c51e Update MAC doc for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 09:46:35 -08:00
Tom Eastep
b4c4fd2efb Update the laptop article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 09:38:50 -08:00
Tom Eastep
3277bd991b Update ipset doc for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 09:10:41 -08:00
Tom Eastep
745e04823d Update the IPSEC doc for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 09:06:09 -08:00
Tom Eastep
0a8905f25b Update configuration basics doc for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-18 08:56:11 -08:00
Tom Eastep
353d4d1b70 Update Helpers doc for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-17 16:32:29 -08:00
Tom Eastep
94f2f5aaab Update the FTP article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-17 16:27:46 -08:00
Tom Eastep
a959c4a3bb Update the Events document for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-17 16:18:33 -08:00
Tom Eastep
340ae1cca1 Update Dynamic Zone document for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-17 16:01:21 -08:00
Tom Eastep
0b1588207d Update the DHCP document for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-17 15:58:37 -08:00
Tom Eastep
9e6109bc36 Update the Bridge document for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-17 15:55:21 -08:00
Tom Eastep
a47cfb4f63 Update the blacklisting article for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-17 15:48:10 -08:00
Tom Eastep
6599425ce9 Update the anatomy doc for 5.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-17 15:32:47 -08:00
Tom Eastep
0a2dc77be0 Update the Actions document 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-17 15:32:24 -08:00
Tom Eastep
21d9d56af0 Remove cruft from the Accounting article 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-16 15:44:23 -08:00
Tom Eastep
c52efbffcb Make current documentation for 5.0 only 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-16 15:24:10 -08:00