Tom Eastep
ee6a1dadbb
Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code
2016-01-05 10:48:48 -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
89d91d37a1
Add Shorewall-init installer support for OpenWRT
...
- Supply sysconfig files for all products
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-12-27 16:47:31 -08:00
Tom Eastep
4b893b2fd6
Install/uninstall fixes from Matt Darfeuille
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
Conflicts:
Shorewall-init/install.sh
2015-12-05 11:56:16 -08:00
Tom Eastep
4139c932a4
More configure/install/uninstall fixes from Matt Darfeuille
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-12-05 08:31:22 -08:00
Tom Eastep
bb538a7c10
Merge branch 'master' into 5.0.0
...
Conflicts:
Shorewall-core/lib.common
Shorewall-core/shorewallrc.debian.systemd
Shorewall-lite/shorewall-lite.service.debian
Shorewall/Perl/Shorewall/Chains.pm
Shorewall/Perl/Shorewall/Compiler.pm
Shorewall/Perl/Shorewall/Config.pm
Shorewall/Perl/Shorewall/Misc.pm
Shorewall/Perl/Shorewall/Raw.pm
Shorewall/Perl/Shorewall/Tc.pm
Shorewall/Perl/compiler.pl
Shorewall/Perl/prog.footer
Shorewall/lib.cli-std
Shorewall/manpages/shorewall-mangle.xml
Shorewall/manpages/shorewall.conf.xml
Shorewall/manpages/shorewall.xml
Shorewall/shorewall.service.debian
Shorewall6-lite/shorewall6-lite.service.debian
Shorewall6/manpages/shorewall6-mangle.xml
Shorewall6/manpages/shorewall6.conf.xml
Shorewall6/manpages/shorewall6.xml
Shorewall6/shorewall6.service.debian
docs/MultiISP.xml
docs/Shorewall_Squid_Usage.xml
2015-10-12 10:55:36 -07:00
Tuomo Soini
f1d4ef495e
shorewall-init.service*: fix [Install] section
...
Signed-off-by: Tuomo Soini <tis@foobar.fi>
2015-09-24 18:17:30 +03:00
Tom Eastep
bde9558962
Version changes in Shorewall Init
...
- Also remove an obsolete comment in init.suse.sh
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-09-06 10:02:41 -07:00
Tom Eastep
4a484ced9e
Delete 'conflicts=' from Shorewall-init .service files
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-08-20 09:19:58 -07:00
Tom Eastep
537f53f611
Restore [Install] section in the Debian .service files
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-08-17 07:41:15 -07:00
Tom Eastep
3b1ad1e284
Delete 'conflicts=' from Shorewall-init .service files
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-08-17 06:40:36 -07:00
Tom Eastep
3b59e46799
Restore Debian-specific service files
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-08-12 10:19:07 -07:00
Tom Eastep
56aa95ea4f
Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code into 5.0.0
...
Conflicts:
Shorewall-core/shorewallrc.debian.systemd
Shorewall-init/shorewall-init.service.debian
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2015-08-10 17:49:00 -07:00
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