Colin Fleming
905bafa1e8
Tidy up "services_dhcp_relay" XHTML
...
Move closing BODY and closing HTML tags after the PHP FEND.INC statement
2014-05-18 14:46:26 +01:00
jim-p
024068017f
/etc/version_kernel and /etc/version_base no longer exist, use php_uname to get the info instead.
2014-05-16 13:10:16 -04:00
jim-p
95589abda7
Move duplicated code into a function; Include local ID on mobile tunnel key line in ipsec.secrets.
2014-05-15 13:34:21 -04:00
jim-p
25e2281c6d
Use the glob on 2.2 now as well for listing PPP serial devices.
...
Rather than doing auto-detection, fall back to a glob for now when listing potential PPP serial devices. This will allow us to push ticket #2433 back to 2.2 with a more proper long-term fix for the auto-detection.
2014-05-15 13:33:45 -04:00
Ermal
95e496d68d
Use the setkey proper path since ipsec-tools are not used anymore
2014-05-15 14:20:31 +00:00
Ermal
4767004f61
Use the right specification for ahnding over the subnet to mobile clients
2014-05-15 14:17:22 +00:00
Ermal
7a1f391a76
Do not specify the rightid in mobile tunnels since it makes things not work
2014-05-15 14:03:17 +00:00
Ermal
34bb5eb09e
Give needed +x flag to make working xauth proper
2014-05-15 14:01:35 +00:00
Ermal
6586b30f3f
Oops this was moved accidentally
2014-05-15 13:50:35 +00:00
Ermal
b4ad5b1c2a
Correct sense of match and move the code up to since it makes more sense
2014-05-15 13:39:32 +00:00
Ermal
abd3c8f4b0
Actually this should be rightauth2 since they should send the extra infor to be validated
2014-05-15 13:29:26 +00:00
Chris Buechler
64a2da809c
bind HTTP->HTTPS redirect to IPv6 too. Ticket #3437
2014-05-14 11:20:39 -05:00
Chris Buechler
b27659bd0f
add guiconfig to widgets not including it. ticket #3498
2014-05-14 10:37:01 -05:00
Chris Buechler
cafc3c1704
remove text not relevant to Allowed IP page. Ticket #3594
2014-05-14 10:25:02 -05:00
Renato Botelho
0e0998625d
Merge pull request #1153 from miken32/master
2014-05-14 09:01:20 -04:00
Michael Newton
0fab7eb132
Fix broken HTML elements and unescaped entities
2014-05-13 20:20:07 -07:00
jim-p
cbf1f885c3
Fix alignment of + button and P2 display after addition of IKE column to IPsec tunnel list.
2014-05-13 13:02:27 -04:00
jim-p
fe3f399854
Fix shortcut bar for ipsec to show the correct service.
2014-05-13 13:00:29 -04:00
Ermal
466a5a8134
Allow to use PSK+agressive mode since user should have the choice even though it poses security risks
2014-05-09 20:13:11 +00:00
Renato Botelho
55493934d4
Merge pull request #1150 from ExolonDX/branch_master_01
2014-05-09 17:09:39 -03:00
Renato Botelho
2eed64dbc9
Merge pull request #1151 from ExolonDX/branch_master_02
2014-05-09 17:09:31 -03:00
Renato Botelho
75b8eb8344
PBIs are crashing without LOGNAME being defined in the environment, define it here until PBI is fixed
2014-05-09 17:04:27 -03:00
Ermal
9879f03adf
This slipped in wrongly
2014-05-09 19:47:27 +00:00
Ermal
f1bede0343
Allow a key to specified for all users as for exmpale when connecting from Apple iOS
2014-05-09 19:41:17 +00:00
Colin Fleming
d2ec82af69
Update links in "vpn_ipsec.php"
...
Update help links in "vpn_ipsec.php" to point to the correct page.
2014-05-09 20:29:34 +01:00
Colin Fleming
a0fca22418
Tidy up "vpn_ipsec_phase1.php" XHTML
...
Add CDATA sections to SCRIPTS
Add SUMMARY to TABLES
Update HTML Boolean operators
Close INPUT tags
2014-05-09 20:27:53 +01:00
Ermal
e8177bbbd0
This needs to be lower case
2014-05-09 18:16:12 +00:00
Daniel Becker
81acbdd7a3
make listening on interface rather than IP optional for miniupnp
2014-05-09 14:56:46 -03:00
Ermal
9abaa8f7d5
Pass the loglevels on the config rather than execing commands to specify these loglevels. This allows somethings to be properly logged as config logs
2014-05-09 17:52:37 +00:00
jim-p
cf4e473b3d
Fix call-time pass-by-reference in UPnP
2014-05-09 13:48:38 -04:00
Renato Botelho
941823677d
Merge pull request #1147 from ExolonDX/branch_master_15
2014-05-09 14:35:09 -03:00
Renato Botelho
be3e65e6cd
Merge pull request #1146 from ExolonDX/branch_master_14
2014-05-09 14:35:01 -03:00
Renato Botelho
f7b16fe6eb
Merge pull request #1144 from ExolonDX/branch_master_12
2014-05-09 14:34:54 -03:00
Renato Botelho
a371b39364
Merge pull request #1143 from ExolonDX/branch_master_11
2014-05-09 14:34:46 -03:00
Renato Botelho
2424dc4b50
Merge pull request #1142 from ExolonDX/branch_master_10
2014-05-09 14:34:35 -03:00
Renato Botelho
a59a4143fc
Merge pull request #1141 from ExolonDX/branch_master_08
2014-05-09 14:34:27 -03:00
Renato Botelho
ecf6cc845d
Merge pull request #1140 from ExolonDX/branch_master_07
2014-05-09 14:34:20 -03:00
Renato Botelho
4a5b2e8b18
Merge pull request #1139 from ExolonDX/branch_master_02
2014-05-09 14:34:11 -03:00
Renato Botelho
0257677d43
Merge pull request #1138 from ExolonDX/branch_master_03
2014-05-09 14:34:03 -03:00
Renato Botelho
4226d6eeba
Merge pull request #1137 from ExolonDX/branch_master_04
2014-05-09 14:33:51 -03:00
Renato Botelho
4bd6a276bc
Merge pull request #1135 from ExolonDX/branch_master_06
2014-05-09 14:33:01 -03:00
Ermal
f9fb8d2b3d
No need to have the ip let strongswan do it for us! Keeping still filterdns to properly evaluate dns behaviour here
2014-05-09 15:40:22 +00:00
Ermal
484e6adcad
Strongswan does not need the quotes here
2014-05-09 15:31:41 +00:00
Ermal
0dc05b2020
Oops unbreak this
2014-05-09 15:09:21 +00:00
Ermal
e381cc0106
Show proper status for ipsec
2014-05-09 15:01:04 +00:00
Ermal
4e2712d60d
Remove Proposal check as a racoon thingy
2014-05-09 14:55:22 +00:00
Ermal
8d0a3abdea
Remove generate policy option since its not relevant with strongswan
2014-05-09 14:03:39 +00:00
Ermal
fc835b04ec
Use better looking description and remove base type from negotiation. This is only IKEv1 parameter. JS will be added later
2014-05-09 13:57:27 +00:00
Ermal
6ae8b844e1
Some adjustments to the code for logging
2014-05-09 13:36:13 +00:00
Ermal
20452c6854
Allow to select IKE version to be used.
2014-05-09 13:26:20 +00:00