Tom Eastep
|
a2abad3f68
|
Modify getparams to use the installed shorewallrc file.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-07 09:07:07 -07:00 |
|
Tom Eastep
|
c5f44d8737
|
Move read_a_line() prototype before first use.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-07 07:42:27 -07:00 |
|
Tom Eastep
|
25bca70ff2
|
Merge branch 'master' into 4.5.2
|
2012-04-07 07:39:14 -07:00 |
|
Tom Eastep
|
7204220991
|
Some more fixes to conditional inclusion.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-07 07:16:17 -07:00 |
|
Tom Eastep
|
97cc4930cf
|
Deimplement option leading ? in embedded directives
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-06 16:26:05 -07:00 |
|
Tom Eastep
|
5688dc77a3
|
Make ?BEGIN PERL end ?END PERL work.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-06 15:58:21 -07:00 |
|
Tom Eastep
|
9dd6f86c55
|
Use read_a_line() in the embedded_shell() and embedded_perl() functions.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-06 15:46:01 -07:00 |
|
Tom Eastep
|
53395e788d
|
Add a comment
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-06 11:49:59 -07:00 |
|
Tom Eastep
|
2de64d5820
|
Remove find_echo() from lib.core
- Also correct a couple of typos in comments
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-06 08:01:07 -07:00 |
|
Tom Eastep
|
24e115d0f9
|
Move a comment
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-06 08:00:20 -07:00 |
|
Tom Eastep
|
29a820b2f2
|
Make handling of remote configuration data consistent.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-04 11:47:45 -07:00 |
|
Tom Eastep
|
bff3473279
|
Fix preceding commit -- it missed to cases of absolute pathnames.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-04 09:43:39 -07:00 |
|
Tom Eastep
|
319d07b1d3
|
Remove more absolute path names
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-04 09:24:48 -07:00 |
|
Tom Eastep
|
38b6dca223
|
Correct a number of issues with Shorewall-lite
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-04 07:08:02 -07:00 |
|
Tom Eastep
|
24d30275fa
|
Correct syntax errors in the generated script
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-03 17:08:14 -07:00 |
|
Tom Eastep
|
fb428bf564
|
Don't modify CONFDIR and SHAREDIR in the shell code
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-02 12:39:49 -07:00 |
|
Tom Eastep
|
348c99c7d0
|
Compiler changes for Shorewall[6]-lite relocation
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-02 07:46:38 -07:00 |
|
Tom Eastep
|
a11e2dd452
|
Correct uninstall scripts
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-02 06:48:23 -07:00 |
|
Tom Eastep
|
85fce606dc
|
Give all config files access to shorewallrc variables.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-01 13:19:38 -07:00 |
|
Tom Eastep
|
bb6e17fd3e
|
Many changes involved in getting a relocated installations to work
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-01 10:47:24 -07:00 |
|
Tom Eastep
|
e48e13012c
|
Fix up lib.base during installation
- Shorewall-core installer creates all necessary directories.
|
2012-04-01 08:16:07 -07:00 |
|
Tom Eastep
|
02a68aa436
|
Look for ./shorewallrc first
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-31 17:40:18 -07:00 |
|
Tom Eastep
|
766370e22a
|
More work on installers
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-31 14:42:01 -07:00 |
|
Tom Eastep
|
75b57b926a
|
Revert "Replace lib.base with symbolic link"
This reverts commit 98f4a1c545 .
|
2012-03-31 12:57:38 -07:00 |
|
Tom Eastep
|
cf176474ac
|
Merge branch '4.5.2'
Conflicts:
Shorewall/Perl/Shorewall/Chains.pm
|
2012-03-31 09:44:36 -07:00 |
|
Tom Eastep
|
6ed207aba0
|
Fix 'dhcp' with 'nets'
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-31 09:30:29 -07:00 |
|
Tom Eastep
|
924ec49d09
|
Add OWNER_NAME_MATCH to do_user
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-30 16:58:38 -07:00 |
|
Tom Eastep
|
a4097b7a02
|
Correct Typo in setup_null_routing()
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-30 16:57:26 -07:00 |
|
Tom Eastep
|
e38fcb2bfc
|
Correct ipset creation and add a WARNING when creating an ipset
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-30 16:56:43 -07:00 |
|
Tom Eastep
|
c3b56d4123
|
Add BLACKLIST Macro
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-30 16:53:02 -07:00 |
|
Tom Eastep
|
fead683f18
|
Modify init scripts if ${SHAREDIR} is non-standard
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-30 16:21:37 -07:00 |
|
Tom Eastep
|
98f4a1c545
|
Replace lib.base with symbolic link
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-30 15:30:04 -07:00 |
|
Tom Eastep
|
f5414d0fd1
|
Create ${SYSTEMD} if needed.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-30 13:56:59 -07:00 |
|
Tom Eastep
|
15335f8615
|
Modify CLIs and libs to know where shorewallrc is.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-30 12:02:25 -07:00 |
|
Tom Eastep
|
0d19c99699
|
Correct default setting of CONFDIR when .shorewallrc is not found
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-28 06:28:53 -07:00 |
|
Tom Eastep
|
c2fa5ae78f
|
Correct typo in install.sh files
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-27 20:19:06 -07:00 |
|
Tom Eastep
|
e1e4855211
|
Rename USR to PREFIX
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-27 07:47:22 -07:00 |
|
Tom Eastep
|
e09457cdf9
|
Correct Typo in setup_null_routing()
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-27 07:46:53 -07:00 |
|
Tom Eastep
|
f2311f1987
|
Update install scripts to look for .shorewallrc in many places
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-26 17:01:55 -07:00 |
|
Tom Eastep
|
b31f656d63
|
Update uninstall scripts for multiple .shorewallrc locations.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-26 16:19:40 -07:00 |
|
Tom Eastep
|
e641bf7ac2
|
Correct typo
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-26 16:01:35 -07:00 |
|
Tom Eastep
|
8a164adf98
|
Export TMPDIR if it exists in the .shorewallrc file
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-26 15:43:04 -07:00 |
|
Tom Eastep
|
7b9c1d43cd
|
Look in additional places for .shorewallrc
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-26 15:00:43 -07:00 |
|
Tom Eastep
|
fd82877312
|
Another fix for init.sh
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-26 07:49:49 -07:00 |
|
Tom Eastep
|
2518c653af
|
Modify RedHat/Fedora init scripts for shorewallrc.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-26 07:20:31 -07:00 |
|
Tom Eastep
|
c23deed3a7
|
Correct syntax error in init.sh
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-26 07:04:21 -07:00 |
|
Tom Eastep
|
dee20c8d74
|
Add OWNER_NAME_MATCH to do_user
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-25 20:18:20 -07:00 |
|
Tom Eastep
|
ee15baf98c
|
Correct typo in Chains.pm
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-25 12:48:57 -07:00 |
|
Tom Eastep
|
25e7555e80
|
Correct typo in the compiler
|
2012-03-25 12:36:25 -07:00 |
|
Tom Eastep
|
9dd9ee614b
|
Correct ipset creation and add a WARNING when creating an ipset
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-03-25 08:27:28 -07:00 |
|