extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-29 11:04:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,259 Commits 104 Branches 736 Tags 55 MiB
69745caa41
Commit Graph

372 Commits

Author SHA1 Message Date
Tom Eastep
8657682dfd Merge branch '5.0.0' of ssh://server.shorewall.net/home/teastep/shorewall/code into 5.0.0 2015-08-08 12:43:02 -07:00
Tom Eastep
ef9e75753a Restore .214 files 
- Also merge Debian changes from 4.6.12

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-01 11:23:35 -07:00
Tom Eastep
8bcee0ee01 Add Debian .service files 
- Install both .service files and SysV init scripts on Debian.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-07-30 14:17:36 -07:00
Tom Eastep
8cddba1e15 Correct shorewall-init.service to avoid dependency loops on Debian 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-07-28 17:24:33 -07:00
Tom Eastep
cecc81ce82 Update .service files 
- make the .214 versions the default and remove the ones name *.214
- Add 'ExecReload' to all but Shorewall-init
- Create Debian-specific versions with /etc/default rather than /etc/sysconfig
 2015-07-26 10:58:03 -07:00
Tuomo Soini
8bc62d1474 Complete Shorewall-init improvements 
completes 548c0558c1

Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2015-06-08 22:15:45 +03:00
Tuomo Soini
e96fcde678 shorewall-init: use consitent indent 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2015-06-08 22:10:21 +03:00
Tuomo Soini
19ab4472c9 shorewall-init.service*: fix description to be more generic 
shorewall-init is not IPv4 only

Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2015-05-26 19:47:28 +03:00
Tom Eastep
548c0558c1 Shorewall-init improvements 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-05-07 12:31:46 -07:00
Tom Eastep
7db99832ca Add ip6tables.service to the conflicts list for Shorewall-init 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-04-18 17:22:35 -07:00
Tuomo Soini
65394b9f8c shorewall-init.service: running shorewall-init must not require networking 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2015-04-12 11:26:40 +03:00
Tuomo Soini
194252afd3 systemd: fix shorewall startup by adding Wants=network-online.target 
Before shorewall failed to load if there were interfaces which were required
but there wasn't any other service which wanted network-online.target.
By adding Wants=network-online.target we make sure shorewall[6]* startup
won't fail if there are required interfaces

Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2015-04-11 10:50:54 +03:00
Tom Eastep
eb3a162560 Apply Matt Darfeuille's fix for fatal_error() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-04-02 13:26:51 -07:00
Tom Eastep
50bbf9499a Don't install in global directories when configure == 0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-03-24 07:51:56 -07:00
Tuomo Soini
3f32afe371 ifupdown*: fix namespace problem with VARDIR 
fixes similar bug than 23e869ad50 did
 2015-01-10 19:07:55 +02:00
Tuomo Soini
23e869ad50 shorewall-init: correctly set STATEDIR, we can't use VARDIR from shorewallrc 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2014-11-24 09:43:32 +02:00
Tom Eastep
ec0ff7f305 Remove $OPTIONS from Shorewall-init service files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-11-12 14:38:48 -08:00
Tom Eastep
4bc91e89db Remove debugging code from Shorewall-init installer 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-19 08:28:41 -07:00
Tom Eastep
e3b10343a5 Change SYSTEMDDIR to SERVICEDIR 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-13 11:56:26 -07:00
Tom Eastep
19482ac197 Allow Shorewall-init installer to create SBINDIR if configure == 0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-09 10:14:23 -07:00
Tom Eastep
42363da458 Add new .service files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-09 10:00:53 -07:00
Tom Eastep
c5074bddb2 Rename the .service files to .service.214 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-09 09:45:52 -07:00
Tom Eastep
4b9d8ad5f6 Merge branch '4.6.4' 
Conflicts:
	Shorewall-init/shorewall-init.service
 2014-10-08 18:26:42 -07:00
Tom Eastep
8e9d769723 Add iptables.service to Shorewall-init conflicts 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-08 18:24:53 -07:00
Tom Eastep
77015ebb4d Adjust the .service files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-08 17:33:33 -07:00
Tom Eastep
12458d111a Adjust the .service files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-08 17:28:22 -07:00
Tom Eastep
815e93e80c Rename SYSTEMD to SYSTEMDDIR 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-07 16:46:16 -07:00
Tom Eastep
6c6a1d82d9 Make Debian installation work with SANDBOX 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-05 16:52:59 -07:00
Tom Eastep
4398fb23d1 Create INITDIR in the Shorewall init installer 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-04 18:49:55 -07:00
Tom Eastep
178d1fbc26 Correct typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-04 14:19:48 -07:00
Tom Eastep
c9fd390782 Final cleanup of the uninstallers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-04 14:07:33 -07:00
Tom Eastep
3206021278 Another round of uninstall fixes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-04 13:50:39 -07:00
Tom Eastep
70bb9147cd Correct Shorewall-init installer handling of SANDBOX 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-04 09:00:12 -07:00
Tom Eastep
00b0489047 Implement SANDBOX variable in the installers/uninstallers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-04 07:50:30 -07:00
Tom Eastep
f9a21bd90e Add -n option to the uninstallers. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-03 17:10:36 -07:00
Tom Eastep
5e81bdfe19 Another install script fix 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-03 17:07:03 -07:00
Tom Eastep
8a5e71a56f Implement the -n option in the installers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-03 07:59:41 -07:00
Tom Eastep
4495ed687b Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2014-09-23 07:10:46 -07:00
Tuomo Soini
a03f00bf0f systemd services: multi-user is not same as old runlevel 3 so use basic 
add conflicts to obviously conflicting services
remove old version number from init files
remove legacy syslog.target which is not needed on modern systems
fix formatting of email address onold Copyright text

Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2014-09-23 16:44:03 +03:00
Tuomo Soini
8f05d0f16d install.sh: support install on centos7 and foobar7 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2014-09-23 13:19:09 +03:00
Tom Eastep
f9d98b74a2 Merge branch '4.6.2' into 4.6.3 
Conflicts:
	Shorewall/Perl/Shorewall/Providers.pm

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-16 08:09:20 -07:00
Tom Eastep
96102623ee Apply Thomas D's patch for SAVE_IPSET in the debian shorewall-init script 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-14 09:49:18 -07:00
Tom Eastep
8236ce572e Apply Louis Lagendijk's patch for Shorewall-init 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-12 16:39:52 -07:00
Tom Eastep
e6132b5630 Additional fixes for Shorewall-init init script. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-06-15 09:03:10 -07:00
Tom Eastep
041e8c445e Correct Shorewall-init Debian init script. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-06-15 09:03:04 -07:00
Tom Eastep
df738025a3 Change for RHEL7. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-05-23 12:18:32 -07:00
Tom Eastep
bcbb48d16e Update install files to secure the .service files as 644 rather than 600. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-05-01 11:43:00 -07:00
Tom Eastep
42dd8dfee9 Change license to GPLv2+ and update copyrights 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-01-04 09:48:27 -08:00
Tom Eastep
9c75895d43 Handle Ubuntu in the init installer 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-10-25 07:08:21 -07:00
Tom Eastep
c2c1552484 Correct syntax error 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-10-25 07:04:03 -07:00
Tom Eastep
5f37b5bde6 Correct install scripts 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-10-25 06:53:51 -07:00
Tom Eastep
66c2fca2b0 Eradicate the use of 'fgrep' 
- Busybox on Leaf Bering does not have fgrep

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-10-14 07:15:08 -07:00
Tom Eastep
b27e3d2fff Merge branch '4.5.21' 2013-10-08 13:17:41 -07:00
Tom Eastep
1659d8ce9f Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2013-10-08 09:52:51 -07:00
Roberto C. Sanchez
12563c55a8 Add '. /lib/lsb/init-functions' to the Debian-specific init scripts, as recommended by lintian 2013-10-05 16:31:45 -04:00
Tom Eastep
13db1bd3be Merge branch 'master' into 4.5.21 2013-10-04 15:54:41 -07:00
Tom Eastep
8a278a3dd6 Correct shorewall-init install. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-10-04 15:54:11 -07:00
Tom Eastep
4bb7942e17 Apply Thomas D's Shorewall-init installer patch. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-10-03 14:06:08 -07:00
Tom Eastep
24218934f8 Clean up uninstall scripts 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-09-30 15:42:58 -07:00
Tom Eastep
308aaad8d4 Use insserv on Debian 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-09-29 09:28:22 -07:00
Tom Eastep
4524281163 Apply Thomas D's Gentoo support patch 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-09-17 08:22:52 -07:00
Tom Eastep
f61560509d Correct indentation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-09-10 08:04:15 -07:00
Tom Eastep
4fcf1cdd3a Terminate the -init installer when distro is not supported 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-09-10 07:37:12 -07:00
Tom Eastep
56bfb6fb8e Initialize T in the Shorewall Init installer 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-09-09 09:49:32 -07:00
Tom Eastep
50411e638c Report the name of the SysV init file installed. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-09-09 08:11:45 -07:00
Tom Eastep
4c6b3e6596 Make Shorewall-init obey OPTIONS setting. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-09-09 07:33:08 -07:00
Tom Eastep
9125a04c45 Apply Thomas D's fix for error message in shorewall-init 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-09-09 06:50:28 -07:00
Tom Eastep
96d833780e Apply Thomas D's fix for SYSCONFFILE in Shorewall-init 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-09-09 06:47:40 -07:00
Tom Eastep
3c1a2d1b41 Yet more improvements to Shorewall-init 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-08-24 09:37:56 -07:00
Tom Eastep
494cdfb73c Some improvements to the shorewall-init scripts. 
- shorewall-init will compile if needed.
- Added setting of 'vardir' to init.sh and init.suse.sh

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-08-20 13:06:25 -07:00
Tom Eastep
39e348997f Add SERVICEFILE variable to shoreallrc. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-08-18 14:27:26 -07:00
Tom Eastep
fc5c92cabc Use /etc/os-release to determine build host 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-08-08 17:44:40 -07:00
Tom Eastep
b10a0642e1 Apply Togan's patch for Shorewall-init.service (again) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-07-24 08:10:27 -07:00
Tom Eastep
96a5d64941 Apply Mr-4's Shorewall-init bugfix patch 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-05-13 11:23:53 -07:00
Tom Eastep
8602dff487 More shorewall-init changes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-05-11 16:38:09 -07:00
Tom Eastep
34f3076c6d Remove duplicate logic and correct one defect. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-05-10 20:21:00 -07:00
Tom Eastep
be7a6ec35d Correct Debian Shorewall-init SysV init script. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-05-06 09:50:51 -07:00
Tom Eastep
cc72b75ba9 Misc fixes to Shorewall-init 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-05-06 09:36:00 -07:00
Tom Eastep
1a4db31ff0 Make NetworkManager with with Shorewall-init on SuSE. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-03-21 15:02:35 -07:00
Tom Eastep
e2123ae276 Correct ifupdown handling on Debian 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-03-15 13:03:53 -07:00
Tom Eastep
b85880e8e6 Correct handling of install on RedHat and derivatives. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-03-15 10:53:36 -07:00
Tom Eastep
3e3cce534e Split ifupdown.sh into separate per-distro scripts. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-03-15 10:25:32 -07:00
Tom Eastep
b5cb27e84e Correct .service files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-01-20 15:15:46 -08:00
Tom Eastep
73b70a86d2 Correct syntax error in Shorewall-init installer 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-05 07:24:40 -07:00
Tom Eastep
a8f324b25c Ensure that the .service files run the utility in ${SBINDIR} 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-24 14:32:20 -07:00
Tom Eastep
abbd1b2c35 Combine two identical cases in the Redhat/Fedora shorewall-init script 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-17 10:23:18 -07:00
Tom Eastep
8c7b8c9390 Correct missing VARLIB handling in the installers. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-10 11:12:43 -07:00
Tom Eastep
c13bdbd316 Correct 'setstatedir' functions in the init scripts 
- Replaced g_program with PRODUCT
- Added setstatedir and call to ifupdown.sh

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-05 07:37:12 -07:00
Tom Eastep
ae1c2cb0ff Use VARLIB rather than VARDIR in the ifupdown script. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-04 15:42:15 -07:00
Tom Eastep
b922177769 Handle missing VARDIR 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-02 15:51:35 -07:00
Tom Eastep
e66d9e3418 Rename VARDIR to VARLIB in shorewallrc 
- Done so that existing shorewallrc files are still valid.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-02 14:36:11 -07:00
Tom Eastep
bf70f6e71e More Shorewall-init init script corrections 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-02 13:43:43 -07:00
Tom Eastep
c31c9bca9c Handle ${CONFDIR}/$PRODUCT/vardir consistently in Shorewall-init init scripts 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-02 10:23:11 -07:00
Tom Eastep
9c6d4f90fb Compile the firewall script if it doesn't exist 
- Also cleaned up a number of defects in the init scripts

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-02 08:35:42 -07:00
Tom Eastep
156fa5ab01 Some fixes to the Fedora Shorewall-init init script 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-01 10:52:59 -07:00
Togan Muftuoglu
1a324fa37f Suse specific patches 
Hi Tom,

I have been patching shorewall packages for the opensuse releases, but I
guess it is better to send them to you . the upstream so it gets
incorporated into shorewall itself and I do not have to patch it ;)

I believe I have incorparted most of my patches in to this one. If you
can review them and if appropriate apply them that would be great

Thanks

Togan

>From 6072c08de753e7d1cc31bb758295dee198197e41 Mon Sep 17 00:00:00 2001
From: Togan Muftuoglu <toganm@opensuse.org>
Date: Fri, 24 Aug 2012 13:17:12 +0200
Subject: [PATCH] suse-specific

Signed-off-by: Togan Muftuoglu <toganm@opensuse.org>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-25 08:45:57 -07:00
Tom Eastep
b45d15eec6 Revert "Apply Togan Muftuoglu's SuSE-specific init patches" 
This reverts commit 2412998b57.
 2012-08-25 08:45:18 -07:00
Tom Eastep
519e799ef1 Unify the mode of init files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-24 06:59:11 -07:00
Tom Eastep
2412998b57 Apply Togan Muftuoglu's SuSE-specific init patches 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-24 06:32:30 -07:00
Tom Eastep
1b7a7d0fdf Remove some more hard-coded directory names from the installers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-17 14:24:52 -07:00