Commit Graph

539 Commits

Author SHA1 Message Date
Rob White
bbff6eb6e5 Merge pull request #284 from nodogsplash/v3.2.0
Release V3.2.0
2018-09-02 20:01:44 +01:00
Rob White
74a2f4bee8 Bump to v3.2.0
Bump to version 3.2.0 and update copyright

Signed-off-by: Rob White <rob@blue-wave.net>
2018-09-02 17:00:57 +01:00
Rob White
f6d5168a81 Bump docs to v3.2.0 and generate debian man page
cd docs
make man

Signed-off-by: Rob White <rob@blue-wave.net>
2018-09-02 15:49:39 +01:00
Rob White
955cbc1560 Documentation and READMe.md updates
Signed-off-by: Rob White <rob@blue-wave.net>
2018-09-02 15:36:44 +01:00
Moritz Warning
5d1dea6b81 add fas_remoteip comment 2018-09-02 15:28:51 +02:00
Moritz Warning
fe97e166db Merge pull request #283 from nodogsplash/init_fas_remoteip
initialize fas_remote with gw_address
2018-09-01 20:21:45 +02:00
Moritz Warning
84cc640880 initialize fas_remote with gw_address 2018-09-01 20:03:15 +02:00
Rob White
09b2116752 Merge pull request #282 from nodogsplash/ForwardAuthentication
Add FAS and Binauth to ndsctl status
2018-09-01 15:16:30 +01:00
Rob White
6ecb462caf Add FAS and Binauth to ndsctl status
Signed-off-by: Rob White <rob@blue-wave.net>
2018-09-01 14:28:47 +01:00
Rob White
5c9841493a Merge pull request #281 from nodogsplash/ForwardAuthentication
Add FAS redirect to status page
2018-08-31 17:24:15 +01:00
Rob White
0177d84dbd Add FAS redirect to status page
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-31 15:49:27 +01:00
Rob White
59e425713c Update of How It Works 2018-08-31 13:44:44 +01:00
Rob White
25be344e7d Correction - release v3.1.0
Correction - it is release v3.1.0. Also added some capitalisation
2018-08-31 11:05:57 +01:00
Rob White
781c846d0a Update readthedocs documentation link
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-29 19:58:15 +01:00
Rob White
7dde352ecd Update Version to 3.1.1 and update copyright year
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-29 19:47:58 +01:00
Rob White
35ba22c2b3 Update faq
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-29 19:40:36 +01:00
Rob White
a162a7028a Disable travis build docs again 2018-08-29 17:57:02 +01:00
Rob White
919a0707ee Enable travis build of docs again
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-29 17:26:28 +01:00
Moritz Warning
5ec4523a2d only support iptables >=v1.4.17
this version deprecated '-m state --state' in favour of '-m conntrack --ctstate'
2018-08-28 18:38:31 +02:00
Moritz Warning
8397b2ecfc improve error message 2018-08-27 14:41:57 +02:00
Moritz Warning
db2a9216b4 Merge branch 'master' of github.com:nodogsplash/nodogsplash 2018-08-27 14:20:45 +02:00
Moritz Warning
a384f316e8 include iptables version check 2018-08-27 14:19:59 +02:00
Rob White
b73a271b3c Merge pull request #279 from nodogsplash/ForwardAuthentication
Documentation update for version 3.1.0
2018-08-26 14:41:42 +01:00
Rob White
2e702ebb4f Documentation update for version 3.1.0
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-26 14:21:57 +01:00
Rob White
0f67390733 Merge pull request #278 from nodogsplash/ForwardAuthentication
Bump to Version 3.1.0
2018-08-26 13:23:35 +01:00
Rob White
92c2e9cdf4 Bump to Version 3.1.0
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-26 13:13:26 +01:00
Moritz Warning
778f4c3c8b adjust some whitespaces 2018-08-26 14:07:10 +02:00
Moritz Warning
12706ebf5d fix travis 2018-08-26 14:03:46 +02:00
Moritz Warning
e9c75700dd move build_libmicrohttpd.sh 2018-08-26 12:57:57 +02:00
Moritz Warning
bc94e81ebd use standard redirect to silence errors
Silences "iptables:No chain/target/match by that name" error on iptalbes rule cleanup.
2018-08-26 03:07:53 +02:00
Moritz Warning
1bb9a7061c make auxiliary libmicrohttpd build script executeable 2018-08-26 01:59:05 +02:00
Moritz Warning
89c85b8079 Merge branch 'master' of github.com:nodogsplash/nodogsplash 2018-08-26 01:53:54 +02:00
Moritz Warning
4888bfacc1 fix config initialisation 2018-08-26 01:53:29 +02:00
Rob White
4f744726f1 Merge pull request #276 from nodogsplash/ForwardAuthentication
Update splash.html and status.html
2018-08-25 20:25:36 +01:00
Rob White
37080db965 Update splash.html and status.html
Make status.html say something meaningful.
Tidy up splash.html a bit

Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-25 20:17:11 +01:00
Rob White
638b69d389 Merge pull request #274 from nodogsplash/ForwardAuthentication
Remove superfluous / character from FAS splashpageurl.
2018-08-24 14:00:20 +01:00
Rob White
8898ab7bd9 Remove superfluous / character from FAS splashpageurl.
Update comment in .conf file to clarify.

Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-24 13:55:33 +01:00
Moritz Warning
952c0a573e remove quotation marks for json numbers 2018-08-24 13:42:10 +02:00
Moritz Warning
2240fe1902 Merge pull request #270 from nodogsplash/json_filter
Json filter
2018-08-24 12:11:28 +02:00
Moritz Warning
d47f1fe89b ndsctl: refactor code to reduce complexity 2018-08-23 22:04:43 +02:00
Moritz Warning
569de84dc3 ndsctl: add optional ip/mac/token filter to json output 2018-08-23 22:04:28 +02:00
Rob White
8a1ce66fde Merge pull request #271 from nodogsplash/ForwardAuthentication
FAS: Update Demo Files and Documentation
2018-08-22 20:34:06 +01:00
Rob White
945a8e6569 Update FAS Demo and FAS Documentation
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-22 20:15:07 +01:00
Moritz Warning
ae3b4d086c pass time by value for format_time()
Signed-off-by: Moritz Warning <moritzwarning@web.de>
2018-08-22 20:24:32 +02:00
Rob White
d33efaa5b7 Remove outdated FAS demo etc folder
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-22 14:15:11 +01:00
Rob White
982ba429c9 Merge pull request #268 from nodogsplash/ForwardAuthentication
Forward Authentication Service (FAS) Integration.
2018-08-22 00:31:16 +01:00
Rob White
baa68c8456 output binauth configuration on startup
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-20 16:17:22 +02:00
Rob White
c2df82e4aa fix indentation
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-20 16:17:22 +02:00
Rob White
77fe80002a lowercase fw_mark variables and change default value format
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-20 16:17:22 +02:00
Rob White
2a429eb7dc update FAS documentation
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-20 16:17:22 +02:00