Commit Graph

2208 Commits

Author SHA1 Message Date
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
Tom Eastep
0d1d2c881f Documentation updates on top of those by Tuomo Soini
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-16 14:14:40 -08:00
Tuomo Soini
97b3dd244a Macros: update headers
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 14:31:00 +02:00
Tuomo Soini
4014fdb204 LXC: update header
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 13:55:52 +02:00
Tuomo Soini
cc2ae454a0 IPP2P: update mangle headers
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 09:54:16 +02:00
Tuomo Soini
4a44cc787e IPv6Support: Add missing DEST to samples and update header format
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 09:45:50 +02:00
Tuomo Soini
457147b7f5 ISO-3661: update rules header to new format
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 09:27:42 +02:00
Tuomo Soini
bb7d41234b ECN: 2006-01-17 is not recent
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-15 09:21:58 +02:00
Tuomo Soini
fcf435bc16 Audit: use new headers
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-14 22:13:55 +02:00
Tuomo Soini
b4ca4b52fe upgrade_issues: fix one typoed "section" and use new header for one sample
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-14 21:53:13 +02:00
Tuomo Soini
5230eb3b65 FAQ: convert to new header format and update blacklist entry to use blrules
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-14 18:31:44 +02:00
Tuomo Soini
704947a1c4 Accounting: update to new config headers and update to ?SECTION
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2016-02-13 19:04:07 +02:00
Tuomo Soini
f08ec7f44c 6to4.xml: add "?FORMAT 2" so that sample actually works 2016-02-12 22:49:01 +02:00
Tuomo Soini
a27a39af0b Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2016-02-10 16:03:40 +02:00
Tuomo Soini
7afdec9f55 6to4: fix documentation to use new config header format 2016-02-10 16:03:14 +02:00
Tom Eastep
1fa2ecf6b9 Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code 2016-02-03 10:56:19 -08:00
Tom Eastep
10e84b8505 Update FAQ and upgrade article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-02-03 10:55:50 -08:00
Tom Eastep
2a56f50d99 Update documentation index for 5.0
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-28 13:52:25 -08:00
Tom Eastep
3bce4627f8 Correct typo in the dhcp article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-01-14 08:56:19 -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
af6fc399e5 Update the configuration basics document
- Reflect the change in column headings in 5.0.3

Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-12-11 14:47:18 -08:00
Tom Eastep
65a0c62b0d Update the 'Build' and 'Install' files for 5.0
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-11-08 13:33:25 -08:00
Tom Eastep
74a839b12e Mention lib.cli-user in the extension script article.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-10-30 09:09:53 -07:00
Tom Eastep
3973cdf0da Merge branch '5.0.1' 2015-10-28 14:35:27 -07:00
Tom Eastep
35b90c2709 Update documentation for 'remote-' vs. 'remote_'
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-10-27 08:16:06 -07:00
Tom Eastep
6e7fc9bee4 Correct L2TP documentation
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-10-26 07:43:28 -07:00
Tom Eastep
87d94ae004 Correct typo in Dynamic article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-10-21 17:32:57 -07:00
Tom Eastep
0dbe756e93 Manpage and Shorewall-5 changes for RESTART
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-10-12 13:49:24 -07:00
Tom Eastep
ec2f4362f3 More cleanup of the configuration file basics article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-10-06 09:36:02 -07:00
Tom Eastep
dc79a74de5 Mention 'reload' in the Introduction Article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-10-05 14:56:01 -07:00
Tom Eastep
35f33b325f Update blacklisting article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-10-05 08:18:52 -07:00
Tom Eastep
89122c0d55 Updates for routestopped -> stoppedrules
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-10-05 07:51:43 -07:00
Tom Eastep
0385b2cd37 Update URLs to tcrules
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-10-04 08:20:33 -07:00
Tom Eastep
fed6e7c352 Update Manpages for Shorewall5
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-10-03 08:50:49 -07:00
Tom Eastep
5ce10a633b Update Articles
-Fix typo in Shorewall-5
-Add tag info in the logging article
2015-09-09 15:31:47 -07:00
Tom Eastep
07976556ed More inline match documentation
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-09-03 09:45:39 -07:00
Tom Eastep
447b7cda4e Describe the discontinued update options in the Shorewall 5 article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-09-01 11:18:38 -07:00
Tom Eastep
377e2037ca Update the Shorewall 5 article for 4.6.13.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-08-31 11:04:00 -07:00
Tom Eastep
463206a3eb Add Shorewall-5 Article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-08-22 13:53:25 -07:00
Tom Eastep
37c9db2bd6 Tweak tcrules references
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-08-20 09:21:42 -07:00
Tom Eastep
12ebb491da Rewrite the trace/debug section of the start/stop article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-08-18 16:34:06 -07:00
Tom Eastep
13650d156e Manual Updates
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-07-26 12:51:51 -07:00
Tom Eastep
0aa7f831c4 Update my config document
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-07-19 13:50:26 -07:00
Tom Eastep
f4741686e6 Correct NFLOG group description
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-07-06 13:42:10 -07:00
Tom Eastep
37248c9698 Correct capitalization of 'IPsec' in the IPsec-2.6 document
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-06-29 15:35:23 -07:00
Tom Eastep
6bd1141a8c Update Build article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-06-29 12:43:04 -07:00
Tom Eastep
267d6c87be Merge branch '4.6.10' 2015-06-19 10:03:16 -07:00
Tom Eastep
d9e4273e6b Clarify the Universal configuration
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-06-19 10:00:05 -07:00
Tom Eastep
f6b77c17ac Correct a couple of blunders in the Introductory article.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-06-08 10:28:18 -07:00
Tom Eastep
6be802aa7c Update the Shorewall 4 article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-06-08 09:46:51 -07:00
Tuomo Soini
86ffbc7e01 Fix typo in commit 1bfae13f75 2015-06-07 22:36:44 +03:00
Tom Eastep
1bfae13f75 Add note about the IPv6 address convention that uses square brackets
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-06-01 11:20:16 -07:00
Tom Eastep
70d41adee8 Delete extraneous '3' from the config basics article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-06-01 10:55:01 -07:00
Tom Eastep
cfc6b7405f Add sample 'findgw' scripts to the Multi-ISP doc
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-05-29 13:44:26 -07:00
Tom Eastep
7a9270136c Clarify Shorewall-core's contribution in the Anatomy article.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-05-06 18:39:32 -07:00
Tom Eastep
a508bcf6d7 Refer to directory relocation from the Anatomy article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-05-05 14:35:42 -07:00
Tom Eastep
864dba2e62 Clarify the need to manually create and modify ipsets
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-04-25 21:14:55 -07:00
Tom Eastep
ccccd847c8 Update the helpers article to mention how to avoid loading a helper.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-04-17 15:22:38 -07:00
Tom Eastep
6cb3004a39 Clarify helper module loading
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-04-17 09:51:25 -07:00
Tom Eastep
551be3ed39 Rearrange script samples in the Multi-ISP document
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-03-30 09:11:20 -07:00
Tom Eastep
6921270c77 Clarify DESTDIR
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-03-24 09:08:30 -07:00
Tom Eastep
79d8d73e02 Correct types in config file basics doc 2015-03-16 15:11:14 -07:00
Tom Eastep
ecaae1f644 Improve editing of open numbers
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-03-15 10:15:39 -07:00
Roberto C. Sánchez
79b6b7cf08 Fix incorrectly specified directory for VARDIR 2015-03-02 10:27:03 -05:00
Tom Eastep
361f5af3e0 Fix broken link
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-02-13 14:28:21 -08:00
Tom Eastep
07c21b8968 Add 'primary' provider option
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-01-06 09:06:27 -08:00
Tom Eastep
2f545012a6 More documentation updates for -C
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-11-02 09:25:58 -08:00
Tom Eastep
7771e5d48f More ipset article tweaks
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-10-07 13:37:56 -07:00
Tom Eastep
0cd694370e Add nat link from Shorewall6 manpages
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-10-07 12:21:44 -07:00
Tom Eastep
5fd7c573fc Clarify Shorewall-init SAVE_IPSETS setting
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-10-07 11:41:57 -07:00
Tom Eastep
80c024c4aa Amplify the 4.6.4 SAVE_IPSETS changes in the ipset article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-10-07 09:52:15 -07:00
Tom Eastep
a72a1ef7a6 Update the install document
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-10-05 13:30:28 -07:00
Tom Eastep
205dd6e250 Add FAQ 104
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-10-01 19:47:56 -07:00
Tom Eastep
2a463e06aa More documentation changes regarding SAVE_IPSETS.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-09-28 17:10:45 -07:00
Tom Eastep
b84a9e16e6 Correct typo in the config basics document
- SOURCE/DEST example had extra colon

Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-09-25 10:59:18 -07:00
Tom Eastep
540eff24aa Correctons to LOG_BACKEND implementation
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-09-24 16:35:41 -07:00
Tom Eastep
580e00dabd Implement LOG_BACKEND option
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-09-24 15:26:13 -07:00
Tom Eastep
a69cec5228 Add link to Events article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-09-23 07:09:56 -07:00
Tom Eastep
feb747260d Add /etc/shorewall/params to the multi-ISP LSM example
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-09-03 06:59:37 -07:00
Tom Eastep
aaa561c831 Mention shell variable rules in the extension script article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-08-21 16:00:58 -07:00
Tom Eastep
aa6bd2819c Update the Build document
- Add build46
- Mention shorewall-pkg.config

Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-08-14 08:03:31 -07:00
Tom Eastep
cf33bac318 Revert most of last change
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-08-10 12:15:08 -07:00
Tom Eastep
0005bb697b Describe a way to improve provider selection from the firewall
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-08-10 09:50:21 -07:00
Tom Eastep
c5549ff21e Update the Configuration File Basics document
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-08-10 08:09:31 -07:00
Tom Eastep
8c0fe063a7 Another tweak to the FTP module documentation
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-07-25 09:03:23 -07:00
Tom Eastep
dbf78d7dd0 Merge branch '4.6.2' 2014-07-25 09:02:48 -07:00
Tom Eastep
bea2b49eb0 More FTP module documentation
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-07-25 08:38:46 -07:00
Tom Eastep
3b4012b60a Document FTP helpers on kernel 3.5 and later in the FTP document
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-07-25 08:15:58 -07:00
Tom Eastep
21209504c5 Correct example from preceding commit
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-07-23 10:47:11 -07:00
Tom Eastep
44a34ceb95 Add complex port-forwarding example to the aliased interfaces article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-07-23 10:36:34 -07:00
Tom Eastep
3e6f57e699 Correct link in the Multi-ISP document
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-07-21 14:33:59 -07:00
Tom Eastep
0ec4cfd18d Fix incorrect link in the complex TC document.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-07-16 15:39:37 -07:00
Tom Eastep
3e6e0b4a09 Amplify the route filtering problem in the multi-ISP document.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-07-13 07:45:51 -07:00
Tom Eastep
a0ab9f6ab2 Update FAQ copyright
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-07-08 07:45:34 -07:00
Tom Eastep
c72265667f Add FAQ 103
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-07-06 08:51:42 -07:00
Tom Eastep
7082bf1971 Update Events.xml with stateful knocking example/description
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-07-01 06:43:20 -07:00
Tom Eastep
a0bb7ca018 Merge branch 'master' into 4.6.1 2014-06-13 07:02:51 -07:00
Roberto C. Sanchez
a8885844ae Fix typos 2014-06-13 07:25:54 -04:00
Tom Eastep
e6372a3e04 Merge branch 'master' into 4.6.1 2014-06-11 15:26:16 -07:00
Roberto C. Sanchez
41ab0d20c9 Update outdated links, thanks to Lee Brown 2014-06-11 16:57:33 -04:00
Tom Eastep
1892cbf218 Remove dest zone name in DNAT- rules.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-06-07 17:02:04 -07:00
Tom Eastep
c0c6bedb17 Fix the DNAT- rule shown in the port-knocking example.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-06-07 16:34:07 -07:00
Tom Eastep
9f9d9fd8d1 Eradicate usage of an interface name in the SOURCE column of the masq file
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-06-02 07:35:02 -07:00
Tom Eastep
ec4fc4ee8f Add 4.6 to the Shorewall 4 document
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-06-01 12:39:00 -07:00
Tom Eastep
0f6bd0e2af Update support guide with the current release information
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-05-22 15:47:44 -07:00
Tom Eastep
b088ea77cd Replace eth1 by eth2 in FAQ 2e
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-05-22 07:20:36 -07:00
Tom Eastep
2859b1aa6e Add bridge instructions to Shorewall FAQ 2
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-05-19 14:18:25 -07:00
Tom Eastep
b79191caa5 Update migration issues document for 4.6.0
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-05-15 08:20:10 -07:00
Tom Eastep
22662212e3 Update FAQ 2 to avoid interface names in the SOURCE column
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-05-15 08:01:09 -07:00
Roberto C. Sanchez
ed9953adb8 Fix broken link 2014-05-06 14:18:37 -04:00
Tom Eastep
2ce28154d1 Update the troubleshooting doc
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-04-21 13:00:08 -07:00
Tom Eastep
afdcff10c9 Update copyright on the Packet handling article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-04-21 12:52:06 -07:00
Tom Eastep
77efea65de Add link from Multi-ISP to packet marking
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-04-20 09:01:00 -07:00
Tom Eastep
658f5c6674 Add 4.6 and update copyrights in two articles
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-03-18 07:29:30 -07:00
Tom Eastep
57637506ba Include tcrules entries for directing connections to a specific provider
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-03-18 07:29:02 -07:00
Tom Eastep
733a17470e Merge branch '4.5.21' 2014-03-05 09:25:26 -08:00
Tom Eastep
3ca3b8b552 Add caution about macros and non-standard ports.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-03-05 09:24:41 -08:00
Tom Eastep
c9d7370fb4 Merge branch '4.5.21'
Conflicts:
	Shorewall/manpages/shorewall.conf.xml
	Shorewall6/manpages/shorewall6.conf.xml

Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-03-05 09:00:34 -08:00
Tom Eastep
3cfee0e43c Updates/corrections to beginner articles
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-03-05 08:57:21 -08:00
Tom Eastep
1bac919ea6 Show equivalent mangle rules in the Multi-ISP article
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-02-27 15:58:51 -08:00
Tom Eastep
238aa68b28 Describe the mangle file in the config file basics article.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-02-27 15:54:05 -08:00
Tom Eastep
3abaf124fa Updates to the manpage tables of contents
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-02-26 10:30:18 -08:00
Tom Eastep
024758bdf6 Update copyright
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-02-25 13:51:33 -08:00
Tom Eastep
8bf76a5f36 Mention AUTOMAKE in the Introductory article.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-02-25 13:27:24 -08:00
Tom Eastep
4a88a3b899 Correct typo in the introduction document.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-02-25 13:21:40 -08:00
Tom Eastep
2e9342aef0 Make the CLI used dependent on the product installed.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-02-11 09:04:18 -08:00
Tom Eastep
3be3c57e65 Mention 'routeback' for vserver hosts entries.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2014-02-03 08:07:53 -08:00
Tom Eastep
dec088566b Merge branch '4.5.21' 2014-01-15 17:39:03 -08:00
Roberto C. Sanchez
240c42943b Cleanup some links in the Shorewall6 manpage listing that pointed to Shorewall manpages 2014-01-12 16:01:54 -05:00
Roberto C. Sanchez
6233f79989 Add links to the blrules documentation from the manpage listings 2014-01-11 08:14:56 -05:00
Tom Eastep
8b49641e07 Replace 'tcrules' with 'mangle' in the docs
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-12-28 17:31:51 -08:00
Tom Eastep
a1222d10cb change 'marks' file to 'mangle'
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-12-28 10:03:23 -08:00
Tom Eastep
45f64aefd7 Change section level of the trunk/docs section
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-12-27 18:17:33 -08:00
Tom Eastep
75515399e0 Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2013-12-24 13:59:52 -08:00
Tom Eastep
615d683848 Correct invalid links
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-12-24 13:55:45 -08:00
Roberto C. Sanchez
d3977a7ad9 Fix typo in copyright date 2013-12-24 16:23:59 -05:00
Tom Eastep
b5295b2039 Add faq 102
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-12-24 11:30:22 -08:00
Roberto C. Sanchez
f4e2602c89 Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2013-12-24 09:59:47 -05:00
Roberto C. Sanchez
c80795102a Fix some broken links 2013-12-24 09:58:44 -05:00
Tom Eastep
670ecb203b Document postcompile
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-12-08 14:12:08 -08:00
Tom Eastep
8faf756113 Add note about non-ACCEPT fw->loc policy.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-12-08 08:33:58 -08:00
Tom Eastep
dac037b597 Clarify 'User exit' and correct description of how extension scripts are used.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-11-28 07:13:47 -08:00
Tom Eastep
4a014d4884 Documentation cleanup
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-11-04 10:50:38 -08:00
Tom Eastep
472ecc661f Fix broken link in netmap.html
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-11-04 10:49:53 -08:00
Tom Eastep
fc3ff30009 Correct the default queue value for NFLOG.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-10-24 07:55:12 -07:00
Tom Eastep
8fb1ce6810 Another network diagram tweak
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-10-21 07:03:53 -07:00
Tom Eastep
4cef6f9254 Make the DMZ object align with the Net object
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-10-14 10:01:21 -07:00
Tom Eastep
4fb80ca698 More tweaking object location
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-10-14 09:41:44 -07:00
Tom Eastep
1666a4639f Another minor tweak.
- Move the cloud upward slightly.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-10-14 07:01:20 -07:00
Tom Eastep
9345219c11 Another tweak to the network diagram
- Show the SMC zone nested in the Net zone
2013-10-14 06:59:31 -07:00
Tom Eastep
589e048086 Update Multi-ISP example
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-10-13 14:03:45 -07:00
Tom Eastep
b45c9bd0d2 Add SeaGL2013 Link
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-10-13 14:03:21 -07:00
Tom Eastep
9f80ad8fb3 Document push_/pop_/set_comment().
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-09-26 07:09:23 -07:00
Tom Eastep
56cb029ef4 Fix broken links
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-09-19 08:14:26 -07:00
Tom Eastep
eb634fa769 Document SERVICEFILE
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-08-18 16:02:14 -07:00
Tom Eastep
e0a222938a Merge branch '4.5.19' 2013-07-27 08:14:35 -07:00
Tom Eastep
36a4ef1676 Correct typo in action.IfEvent
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-07-25 06:10:11 -07:00
Tom Eastep
4edbad6849 Describe the need for LSM to provide failover.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-07-24 09:55:38 -07:00
Tom Eastep
765b748283 Documentation updates
- Add meaningful IDs to some sections in Events.xml
- Correct typos in the accounting manpages

Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-07-22 07:54:45 -07:00
Tom Eastep
7aa33c140d Add an AutoBL action with helper AutoBLL
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-07-17 10:19:18 -07:00
Tom Eastep
04c2a88d74 Add caution to the Events example on blacklisting
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-07-15 14:30:31 -07:00
Tom Eastep
8c27b027fc Break <command> into <command>[<optionlist>]
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-07-14 08:44:01 -07:00
Tom Eastep
5ba8df81fb Further improve readability of the show event[s] commands.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-07-13 09:08:50 -07:00
Tom Eastep
3625d9eae7 Mention /proc/net/xt_recent/* in the Events document
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-07-12 17:08:58 -07:00
Tom Eastep
51d5ec6b2b Make the output of 'show event[2] understandable
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-07-12 16:07:22 -07:00
Tom Eastep
c7ad12177a Enhance description of events by mentioning xt_recent options.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-07-12 14:47:22 -07:00
Tom Eastep
d68b581f3b Update the packet marking document for the Event mark bit
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-07-12 07:42:09 -07:00
Tom Eastep
501007d0ac Correct the Events article.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2013-07-12 07:14:42 -07:00