ipfire-2.x.git
2 years agoDownload sources via HTTPS
Michael Tremer [Thu, 12 Oct 2017 14:56:34 +0000 (15:56 +0100)] 
Download sources via HTTPS

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoinstaller: Fix detection if we have the correct ISO image mounted
Michael Tremer [Thu, 12 Oct 2017 14:50:31 +0000 (15:50 +0100)] 
installer: Fix detection if we have the correct ISO image mounted

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoinstaller: Allow download of ISO images over HTTPS
Michael Tremer [Thu, 12 Oct 2017 14:32:21 +0000 (15:32 +0100)] 
installer: Allow download of ISO images over HTTPS

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoipfire-netboot: Update to v2.0
Michael Tremer [Wed, 11 Oct 2017 20:02:44 +0000 (21:02 +0100)] 
ipfire-netboot: Update to v2.0

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agounbound: Update to 1.6.7
Matthias Fischer [Wed, 11 Oct 2017 15:37:23 +0000 (17:37 +0200)] 
unbound: Update to 1.6.7

For details see:
http://www.unbound.net/download.html

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoalso force TLS when requiring user authentication in WebUI
Peter Müller [Wed, 11 Oct 2017 16:30:50 +0000 (18:30 +0200)] 
also force TLS when requiring user authentication in WebUI

Force TLS _and_ a valid login when accessing protected directories.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agogenerate ECDSA key on existing installations
Peter Müller [Wed, 11 Oct 2017 17:46:35 +0000 (19:46 +0200)] 
generate ECDSA key on existing installations

This is required since Apache crashes if any of the key/certificate files
does not exist.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoship changed files for Apache and ECDSA
Peter Müller [Wed, 11 Oct 2017 17:47:19 +0000 (19:47 +0200)] 
ship changed files for Apache and ECDSA

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoenable dual-stack ECDSA and RSA certificates in Apache
Peter Müller [Wed, 11 Oct 2017 17:45:19 +0000 (19:45 +0200)] 
enable dual-stack ECDSA and RSA certificates in Apache

Note: Apache crashes if any of these files does not exist. Thereof it
is necessary to generate missing keys on existing installations.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agogenerate ECDSA key on existing installations
Peter Müller [Wed, 11 Oct 2017 17:45:33 +0000 (19:45 +0200)] 
generate ECDSA key on existing installations

Generate ECDSA key (and sign it) in case it does not exist. That way,
httpscert can be ran on existing installations without breaking already
generated (RSA) keys.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoprefer ECDSA over RSA and remove clutter
Peter Müller [Wed, 11 Oct 2017 17:24:10 +0000 (19:24 +0200)] 
prefer ECDSA over RSA and remove clutter

Priorize ECDSA before RSA and remove unused cipher suites.
Remove redundant OpenSSL directives to make SSL configuration more readable.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoweb-user-interface: Removed 'dial.cgi' from lfs-file
Matthias Fischer [Wed, 11 Oct 2017 16:08:30 +0000 (18:08 +0200)] 
web-user-interface: Removed 'dial.cgi' from lfs-file

'dial.cgi' was removed in

https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=dc6ed83537e1bcc1347ad16bee095ef4d641bc69

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agonetboot: Update to 1.2
Michael Tremer [Wed, 11 Oct 2017 18:59:48 +0000 (19:59 +0100)] 
netboot: Update to 1.2

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Allow editing terms in coupon mode
Michael Tremer [Wed, 11 Oct 2017 13:52:03 +0000 (14:52 +0100)] 
captive: Allow editing terms in coupon mode

Since the terms are always shown when set, we need a way
to edit them in coupon mode as well.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocore115: Ship updated extrahd.pl
Michael Tremer [Wed, 11 Oct 2017 11:20:44 +0000 (12:20 +0100)] 
core115: Ship updated extrahd.pl

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoRemove PRINT-line in extrahd.pl
Matthias Fischer [Tue, 3 Oct 2017 13:40:25 +0000 (15:40 +0200)] 
Remove PRINT-line in extrahd.pl

As shown in https://forum.ipfire.org/viewtopic.php?f=50&t=19563#p111055
PRINT-output somehow garbles bash-prompt.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocore115: Ship latest OpenVPN changes
Michael Tremer [Wed, 11 Oct 2017 10:56:07 +0000 (11:56 +0100)] 
core115: Ship latest OpenVPN changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoOpenVPN: Fix for '--ns-cert-type server is deprecated' .
Erik Kapfer [Fri, 6 Oct 2017 13:14:48 +0000 (15:14 +0200)] 
OpenVPN: Fix for '--ns-cert-type server is deprecated' .

- Added extended key usage based on RFC3280 TLS rules for OpenVPNs OpenSSL configuration,
so '--remote-cert-tls' can be used instead of the old and deprecated '--ns-cert-type'
if the host certificate are newely generated with this options.
Nevertheless both directives (old and new) will work also with old CAs.

- Automatic detection if the host certificate uses the new options.
If it does, '--remote-cert-tls server' will be automatically set into the client
configuration files for Net-to-Net and Roadwarriors connections.

If it does NOT, the old '--ns-cert-type server' directive will be set in the client
configuration file.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoremove unused dial.cgi directives from Apache vhosts config
Peter Müller [Tue, 10 Oct 2017 13:31:07 +0000 (15:31 +0200)] 
remove unused dial.cgi directives from Apache vhosts config

Remove configuration lines in Apache vhosts files which
are not used anymore (old dial.cgi stuff).

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agodelete unused dial.cgi file
Peter Müller [Mon, 9 Oct 2017 20:06:33 +0000 (22:06 +0200)] 
delete unused dial.cgi file

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocore115: No need to reload apache after it has been restarted
Michael Tremer [Mon, 9 Oct 2017 13:58:41 +0000 (14:58 +0100)] 
core115: No need to reload apache after it has been restarted

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocore115: Regenerate IPsec configuration
Michael Tremer [Mon, 9 Oct 2017 13:58:26 +0000 (14:58 +0100)] 
core115: Regenerate IPsec configuration

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoadd missing check for Curve25519 in vpnmain.cgi
Peter Müller [Sun, 8 Oct 2017 18:41:10 +0000 (20:41 +0200)] 
add missing check for Curve25519 in vpnmain.cgi

This fixes bug #11501 which causes IPsec connections to crash if
Curve25519 has been enabled.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocore115: Rebuild language cache during update
Michael Tremer [Mon, 9 Oct 2017 13:50:29 +0000 (14:50 +0100)] 
core115: Rebuild language cache during update

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocore115: Ship updated apache
Michael Tremer [Mon, 9 Oct 2017 13:49:34 +0000 (14:49 +0100)] 
core115: Ship updated apache

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoapache: Update to 2.4.28
Matthias Fischer [Sun, 8 Oct 2017 14:37:21 +0000 (16:37 +0200)] 
apache: Update to 2.4.28

http://apache.mirror.digionline.de//httpd/CHANGES_2.4.28

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Fix saving empty terms
Michael Tremer [Mon, 9 Oct 2017 13:34:21 +0000 (14:34 +0100)] 
captive: Fix saving empty terms

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoDownload ISO images from https://downloads.ipfire.org
Michael Tremer [Fri, 6 Oct 2017 12:03:40 +0000 (13:03 +0100)] 
Download ISO images from https://downloads.ipfire.org

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoPull latest translations for installer & setup from Transifex
Michael Tremer [Fri, 6 Oct 2017 11:15:26 +0000 (12:15 +0100)] 
Pull latest translations for installer & setup from Transifex

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocore115: Include captive portal in updater
Michael Tremer [Fri, 6 Oct 2017 10:48:49 +0000 (11:48 +0100)] 
core115: Include captive portal in updater

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocore115: Add captive portal cron jobs to updater
Michael Tremer [Thu, 5 Oct 2017 10:38:05 +0000 (11:38 +0100)] 
core115: Add captive portal cron jobs to updater

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive portal: Correctly initialise an array for 8h timeout
Michael Tremer [Thu, 5 Oct 2017 09:42:04 +0000 (10:42 +0100)] 
captive portal: Correctly initialise an array for 8h timeout

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive portal: Reload firewall rules after cleanup
Michael Tremer [Thu, 5 Oct 2017 10:09:58 +0000 (12:09 +0200)] 
captive portal: Reload firewall rules after cleanup

This is not necessary to stop any clients from accessing the
Internet, but if we know that we don't need a line for certain
any more, we can as well remove the firewall rule straight away.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptivectrl: Remove unused code
Michael Tremer [Thu, 5 Oct 2017 10:06:45 +0000 (12:06 +0200)] 
captivectrl: Remove unused code

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive portal: Don't remove unlimited access after one hour
Michael Tremer [Thu, 5 Oct 2017 10:04:29 +0000 (12:04 +0200)] 
captive portal: Don't remove unlimited access after one hour

Reported-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoMerge branch 'captive-portal' into next
Michael Tremer [Wed, 4 Oct 2017 15:10:07 +0000 (16:10 +0100)] 
Merge branch 'captive-portal' into next

2 years agocaptive portal: Allow sessions to expire after 8 hours
Michael Tremer [Wed, 4 Oct 2017 13:21:12 +0000 (14:21 +0100)] 
captive portal: Allow sessions to expire after 8 hours

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive-portal: Serve Ubuntu font files locally
Michael Tremer [Wed, 4 Oct 2017 11:55:17 +0000 (12:55 +0100)] 
captive-portal: Serve Ubuntu font files locally

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoAdd Ubuntu font family package
Michael Tremer [Wed, 4 Oct 2017 11:47:28 +0000 (12:47 +0100)] 
Add Ubuntu font family package

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocore115: Ship update for OpenVPN
Michael Tremer [Sat, 30 Sep 2017 11:34:37 +0000 (12:34 +0100)] 
core115: Ship update for OpenVPN

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoopenvpn: Update to 2.3.18
Matthias Fischer [Sat, 30 Sep 2017 05:41:56 +0000 (07:41 +0200)] 
openvpn: Update to 2.3.18

Fixes CVE-2017-12166: out of bounds write in key-method 1

For details see:

https://community.openvpn.net/openvpn/wiki/CVE-2017-12166

Changelog:
https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn23#OpenVPN2.3.18

Removed an unrecognized 'configure'-option.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agotor: Update to 3.1.7
Matthias Fischer [Fri, 29 Sep 2017 18:42:31 +0000 (20:42 +0200)] 
tor: Update to 3.1.7

Fixes TROVE-2017-008 and CVE-2017-0380 and others....

For details see  https://gitweb.torproject.org/tor.git/plain/ReleaseNotes?id=tor-0.3.1.7
"Tor 0.3.1.7 is the first stable release in the 0.3.1 series."

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocore115: Ship cosmetic improvements in proxy.cgi
Michael Tremer [Sun, 24 Sep 2017 19:23:06 +0000 (20:23 +0100)] 
core115: Ship cosmetic improvements in proxy.cgi

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoproxy.cgi: Some cosmetics for the absolutely lazy ones (V2)
Matthias Fischer [Wed, 20 Sep 2017 23:46:27 +0000 (01:46 +0200)] 
proxy.cgi: Some cosmetics for the absolutely lazy ones (V2)

Added clickable links for 'URL filter' and 'Update accelerator' for faster access,
this time without the need to alter the language-files.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agostart core115
Arne Fitzenreiter [Sun, 24 Sep 2017 13:51:12 +0000 (15:51 +0200)] 
start core115

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2 years agoMerge branch 'master' into next
Arne Fitzenreiter [Sun, 24 Sep 2017 13:45:04 +0000 (15:45 +0200)] 
Merge branch 'master' into next

2 years agocore114: add php to updater v2.19-core114
Arne Fitzenreiter [Sun, 24 Sep 2017 11:35:01 +0000 (13:35 +0200)] 
core114: add php to updater

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2 years agowpa_supplicant: Update to 2.6
Matthias Fischer [Fri, 22 Sep 2017 23:34:55 +0000 (01:34 +0200)] 
wpa_supplicant: Update to 2.6

For details see:
https://w1.fi/cgit/hostap/plain/wpa_supplicant/ChangeLog

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoMerge remote-tracking branch 'origin/next'
Arne Fitzenreiter [Sat, 23 Sep 2017 08:38:18 +0000 (10:38 +0200)] 
Merge remote-tracking branch 'origin/next'

2 years agofinish core114
Arne Fitzenreiter [Sat, 23 Sep 2017 08:37:02 +0000 (10:37 +0200)] 
finish core114

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2 years agocore114: force update addons after core update
Arne Fitzenreiter [Sat, 23 Sep 2017 08:34:54 +0000 (10:34 +0200)] 
core114: force update addons after core update

apache needs new vhost configs so all addons must updated to work with new
apache.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2 years agocaptive: Update configuration for Apache 2.4
Michael Tremer [Fri, 22 Sep 2017 18:34:29 +0000 (19:34 +0100)] 
captive: Update configuration for Apache 2.4

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoRootfile update
Michael Tremer [Fri, 5 May 2017 10:48:03 +0000 (11:48 +0100)] 
Rootfile update

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Show access page in browser language
Michael Tremer [Wed, 3 May 2017 13:39:50 +0000 (15:39 +0200)] 
captive: Show access page in browser language

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Tested-by: Daniel Weismüller <daniel.weismüller@ipfire.org>
2 years agocaptive: Do not try to execute the favicon
Michael Tremer [Wed, 3 May 2017 13:11:30 +0000 (15:11 +0200)] 
captive: Do not try to execute the favicon

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Fix passing redirection URL
Michael Tremer [Wed, 3 May 2017 13:01:02 +0000 (15:01 +0200)] 
captive: Fix passing redirection URL

Reported-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Run apache in HTTP/1.0 mode
Michael Tremer [Wed, 3 May 2017 12:58:23 +0000 (14:58 +0200)] 
captive: Run apache in HTTP/1.0 mode

Reported-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Tested-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Fix another typo in captivectrl
Michael Tremer [Tue, 2 May 2017 10:04:06 +0000 (11:04 +0100)] 
captive: Fix another typo in captivectrl

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Fix typo in German translation
Michael Tremer [Tue, 2 May 2017 10:02:21 +0000 (11:02 +0100)] 
captive: Fix typo in German translation

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Let apache follow symlinks to load bootstrap
Michael Tremer [Tue, 2 May 2017 09:58:57 +0000 (10:58 +0100)] 
captive: Let apache follow symlinks to load bootstrap

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Fix directory permissions
Michael Tremer [Tue, 2 May 2017 09:55:58 +0000 (10:55 +0100)] 
captive: Fix directory permissions

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Logo directory no longer exists
Michael Tremer [Tue, 2 May 2017 09:55:19 +0000 (10:55 +0100)] 
captive: Logo directory no longer exists

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoRootfile update
Michael Tremer [Tue, 2 May 2017 09:37:54 +0000 (10:37 +0100)] 
Rootfile update

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoapache2: Create captive portal logging directory
Michael Tremer [Tue, 2 May 2017 09:37:41 +0000 (10:37 +0100)] 
apache2: Create captive portal logging directory

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoActually build bootstrap
Michael Tremer [Tue, 2 May 2017 09:36:43 +0000 (10:36 +0100)] 
Actually build bootstrap

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoUpdate German translation for captive portal
Michael Tremer [Mon, 1 May 2017 15:13:06 +0000 (16:13 +0100)] 
Update German translation for captive portal

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Link .map files as well
Michael Tremer [Mon, 1 May 2017 15:08:24 +0000 (16:08 +0100)] 
captive: Link .map files as well

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agobootstrap: Install map files, too
Michael Tremer [Mon, 1 May 2017 15:07:40 +0000 (16:07 +0100)] 
bootstrap: Install map files, too

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Show message when an invalid coupon code was entered
Michael Tremer [Mon, 1 May 2017 11:39:42 +0000 (12:39 +0100)] 
captive: Show message when an invalid coupon code was entered

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Do not show checkbox when in coupon mode
Michael Tremer [Mon, 1 May 2017 11:37:44 +0000 (12:37 +0100)] 
captive: Do not show checkbox when in coupon mode

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Verify that the user actually accepted the terms and conditions
Michael Tremer [Mon, 1 May 2017 11:35:45 +0000 (12:35 +0100)] 
captive: Verify that the user actually accepted the terms and conditions

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Style any error messages
Michael Tremer [Mon, 1 May 2017 11:24:07 +0000 (12:24 +0100)] 
captive: Style any error messages

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Show a message when no coupon code was entered
Michael Tremer [Mon, 1 May 2017 11:06:11 +0000 (12:06 +0100)] 
captive: Show a message when no coupon code was entered

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Fix some template updates that I forgot
Michael Tremer [Mon, 1 May 2017 10:47:04 +0000 (11:47 +0100)] 
captive: Fix some template updates that I forgot

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Drop duplicate function to list active clients
Michael Tremer [Mon, 1 May 2017 10:41:51 +0000 (11:41 +0100)] 
captive: Drop duplicate function to list active clients

There was a function with different name but essentially
same functionality which is already existant in &show_clients().

Therefore this patch drops the old function without any functional
changes.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Redesign clients list box
Michael Tremer [Mon, 1 May 2017 10:40:06 +0000 (11:40 +0100)] 
captive: Redesign clients list box

Mostly code cleanup

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Redesign generated coupons table
Michael Tremer [Mon, 1 May 2017 10:26:04 +0000 (11:26 +0100)] 
captive: Redesign generated coupons table

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Correctly set coupon lifetime
Michael Tremer [Fri, 28 Apr 2017 14:39:05 +0000 (15:39 +0100)] 
captive: Correctly set coupon lifetime

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Remember selected coupon expiry time
Michael Tremer [Fri, 28 Apr 2017 14:12:08 +0000 (15:12 +0100)] 
captive: Remember selected coupon expiry time

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Allow creating multiple coupons in bulk
Michael Tremer [Fri, 28 Apr 2017 14:09:56 +0000 (15:09 +0100)] 
captive: Allow creating multiple coupons in bulk

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Reformat times
Michael Tremer [Fri, 28 Apr 2017 13:56:48 +0000 (14:56 +0100)] 
captive: Reformat times

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Cleanup coupon generation block
Michael Tremer [Fri, 28 Apr 2017 13:54:26 +0000 (14:54 +0100)] 
captive: Cleanup coupon generation block

No functional changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Cleanup logo upload
Michael Tremer [Fri, 28 Apr 2017 13:41:57 +0000 (14:41 +0100)] 
captive: Cleanup logo upload

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Cleanup authentication selection
Michael Tremer [Fri, 28 Apr 2017 13:38:59 +0000 (14:38 +0100)] 
captive: Cleanup authentication selection

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Code cleanup
Michael Tremer [Fri, 28 Apr 2017 13:34:14 +0000 (14:34 +0100)] 
captive: Code cleanup

No functional changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Allow uploading JPEG images, too
Michael Tremer [Fri, 28 Apr 2017 13:29:15 +0000 (14:29 +0100)] 
captive: Allow uploading JPEG images, too

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Serve logo through an extra CGI script
Michael Tremer [Fri, 28 Apr 2017 13:21:18 +0000 (14:21 +0100)] 
captive: Serve logo through an extra CGI script

This CGI script makes saving the logo easier (especially for
backup purposes).

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Save logo in /var/ipfire/captive
Michael Tremer [Fri, 28 Apr 2017 12:53:57 +0000 (13:53 +0100)] 
captive: Save logo in /var/ipfire/captive

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Allow selecting the session expiry time for terms
Michael Tremer [Wed, 26 Apr 2017 15:44:27 +0000 (16:44 +0100)] 
captive: Allow selecting the session expiry time for terms

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Group settings together and create branding section
Michael Tremer [Wed, 26 Apr 2017 11:59:36 +0000 (12:59 +0100)] 
captive: Group settings together and create branding section

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Some more CGI cleanup
Michael Tremer [Wed, 26 Apr 2017 11:55:40 +0000 (12:55 +0100)] 
captive: Some more CGI cleanup

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Rename "Voucher" mode to "Coupon"
Michael Tremer [Wed, 26 Apr 2017 11:50:43 +0000 (12:50 +0100)] 
captive: Rename "Voucher" mode to "Coupon"

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Rename "License" mode to "Terms & Conditions"
Michael Tremer [Wed, 26 Apr 2017 11:27:35 +0000 (12:27 +0100)] 
captive: Rename "License" mode to "Terms & Conditions"

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Allow selecting highlight colour in web interface
Michael Tremer [Wed, 26 Apr 2017 11:03:08 +0000 (12:03 +0100)] 
captive: Allow selecting highlight colour in web interface

To be able to customise the access page, we now allow the
user to select a brand colour.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Refactor the access page
Michael Tremer [Wed, 26 Apr 2017 10:53:15 +0000 (11:53 +0100)] 
captive: Refactor the access page

This brings no functional changes, but cleans up the code
to re-use more and write less.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Get MAC address of a device without calling arp
Michael Tremer [Tue, 25 Apr 2017 11:52:29 +0000 (12:52 +0100)] 
captive: Get MAC address of a device without calling arp

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Don't compare action string
Michael Tremer [Tue, 25 Apr 2017 11:32:05 +0000 (12:32 +0100)] 
captive: Don't compare action string

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive: Import new design
Michael Tremer [Tue, 25 Apr 2017 11:24:45 +0000 (12:24 +0100)] 
captive: Import new design

This is the new design of the access page of the captive
portal. It is based on the Bootstrap 4 grid system and
reboot but does not use anything else from it.

It is responsive and customisable.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agobootstrap: New package
Michael Tremer [Mon, 24 Apr 2017 11:25:53 +0000 (12:25 +0100)] 
bootstrap: New package

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agocaptive-portal: Use template engine to render HTML template
Michael Tremer [Fri, 21 Apr 2017 16:34:59 +0000 (17:34 +0100)] 
captive-portal: Use template engine to render HTML template

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>