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
Tom Eastep
691a9bf793
Correct installation on systems with systemd
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-07-14 14:38:30 -07:00
Tom Eastep
baa2c4f5eb
Merge branch '4.5.4'
2012-06-02 09:30:47 -07:00
Tom Eastep
579104833e
Restore installation of the ifupdown script in if-post-down.d on Debian
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-06-02 09:25:20 -07:00
Tom Eastep
099133f7ff
Clear PHASE on non-Debian systems in the ifupdown script
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-06-02 09:23:31 -07:00
Tom Eastep
67883a369c
Add logrotate file to Shorewall-init
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-06-02 08:26:06 -07:00
Tom Eastep
f7104b3d26
Add LOGFILE option to Shorewall-init configuration.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-06-01 15:54:03 -07:00
Tom Eastep
c823b0e41e
More Shorewall-init fixes
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-06-01 14:04:08 -07:00
Tom Eastep
fe5d89b243
Install the ifupdown script in if-down.d rather than if-post-down.d on Debian
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-06-01 14:03:57 -07:00
Tom Eastep
312efe5c7b
Use enable/disable for up and down of provider interfaces
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-06-01 11:27:57 -07:00
Tom Eastep
70e6bda3bb
Fix a couple of problems in Shorewall-init
...
- Remove fly speck from installer
- Don't bother to save/restore VARDIR
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-06-01 08:10:41 -07:00
Tom Eastep
02006288b0
Fixes for Shorewall-init
...
- Enable at boot on debian
- Clear environment for each product
2012-05-31 19:15:23 -07:00
Tom Eastep
b0c07aa6d6
Fix typo in ifupdown.sh
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-04-04 11:47:00 -07:00
Tom Eastep
abd864eecb
Update copyrights in init scripts that have them
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-04-03 07:52:39 -07:00
Tom Eastep
7db79a6d40
Fix ifupdown
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-04-03 07:52:14 -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
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
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
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
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
2d841269ee
Remove 'local file'
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-28 17:01:56 -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
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
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
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
8a18dac870
Installer tweaks
...
- Give instructions when Shorewall-core installer finds no rc file
- Update help
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-25 07:49:52 -07:00
Tom Eastep
877796a7ca
Add shorewallrc processing to other CLI programs
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-24 22:14:01 -07:00
Tom Eastep
eb118e4443
Add shorewallrc files.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-24 13:05:39 -07:00
Tom Eastep
4b74fe2823
Restore SAVE_IPSET functionality
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-01 07:53:42 -08:00
Tom Eastep
36d4fff7b2
Shorewall-init tweaks
...
1) Remove root check
2) Fix/add progress messages in the installer.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-01 07:21:17 -08:00
Tom Eastep
67a1438a41
Tweak /sbin/shorewall-init
...
1) Make indentation consistent
2) Remove IPSET_SAVE logic
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-01 06:41:06 -08:00
Tom Eastep
2397449fa4
Add /sbin/shorewall-init for use with service.d
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-29 08:39:27 -08:00
Tom Eastep
37a3dbb6f6
Don't install SysV init script if systemd is specified.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-23 10:59:10 -08:00