vpn: merge export code into single file

9859d51e · Franco Fichtner · 0e03967c · 9859d51e · 0e03967c · 9859d51e
Commit 9859d51e authored Oct 01, 2016 by Franco Fichtner
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 795 additions and 827 deletions

plist plist +0 -1

openvpn-client-export.inc src/etc/inc/openvpn-client-export.inc +0 -822

vpn_openvpn_export.php src/www/vpn_openvpn_export.php +795 -4

No files found.
--- a/plist
+++ b/plist
@@ -37,7 +37,6 @@
 /usr/local/etc/inc/notices.plain_sasl_client.inc
 /usr/local/etc/inc/notices.sasl.inc
 /usr/local/etc/inc/notices.smtp.inc
-/usr/local/etc/inc/openvpn-client-export.inc
 /usr/local/etc/inc/openvpn.auth-user.php
 /usr/local/etc/inc/openvpn.inc
 /usr/local/etc/inc/openvpn.tls-verify.php

--- a/src/etc/inc/openvpn-client-export.inc
+++ b/src/etc/inc/openvpn-client-export.inc
--- a/src/www/vpn_openvpn_export.php
+++ b/src/www/vpn_openvpn_export.php