From: "Peter Müller" <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3e7e92652e836c199dc33cfe571bd084d27097a8
Date: Sat, 11 Jun 2022 14:35:42 +0000 [thread overview]
Message-ID: <4LL0k64qYlz2xsy@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3947 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 3e7e92652e836c199dc33cfe571bd084d27097a8 (commit)
via 574f4538533bb78a7daea1b7212bc3a80a67b382 (commit)
from a56d36b07804b31c555fa5241036c592e682adf8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3e7e92652e836c199dc33cfe571bd084d27097a8
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Jun 11 14:35:23 2022 +0000
Core Update 169: Ship ovpnmain.cgi
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 574f4538533bb78a7daea1b7212bc3a80a67b382
Author: Jon Murphy <jon.murphy(a)ipfire.org>
Date: Thu Jun 9 16:27:23 2022 -0500
ovpnmain.cgi: correct spelling
- change "coment" to "comment"
Signed-off-by: Jon Murphy <jon.murphy(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/169/filelists/files | 1 +
html/cgi-bin/ovpnmain.cgi | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/169/filelists/files b/config/rootfiles/core/169/filelists/files
index 21f5764f1..0eee92b92 100644
--- a/config/rootfiles/core/169/filelists/files
+++ b/config/rootfiles/core/169/filelists/files
@@ -4,6 +4,7 @@ etc/rc.d/helper/aws-setup
etc/rc.d/helper/exoscale-setup
etc/rc.d/helper/gcp-setup
opt/pakfire/etc/pakfire.conf
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/html/themes/ipfire/include/functions.pl
usr/sbin/setup
var/ipfire/header.pl
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index fd6d14ab3..c2558bd81 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2337,17 +2337,17 @@ else
if ( $vpnsettings{'ENABLED'} eq 'on'){
print CLIENTCONF "remote $vpnsettings{'VPN_IP'} $vpnsettings{'DDEST_PORT'}\r\n";
if ( $vpnsettings{'ENABLED_BLUE'} eq 'on' && (&haveBlueNet())){
- print CLIENTCONF "#Coment the above line and uncoment the next line, if you want to connect on the Blue interface\r\n";
+ print CLIENTCONF "#comment the above line and uncomment the next line, if you want to connect on the Blue interface\r\n";
print CLIENTCONF ";remote $netsettings{'BLUE_ADDRESS'} $vpnsettings{'DDEST_PORT'}\r\n";
}
if ( $vpnsettings{'ENABLED_ORANGE'} eq 'on' && (&haveOrangeNet())){
- print CLIENTCONF "#Coment the above line and uncoment the next line, if you want to connect on the Orange interface\r\n";
+ print CLIENTCONF "#comment the above line and uncomment the next line, if you want to connect on the Orange interface\r\n";
print CLIENTCONF ";remote $netsettings{'ORANGE_ADDRESS'} $vpnsettings{'DDEST_PORT'}\r\n";
}
} elsif ( $vpnsettings{'ENABLED_BLUE'} eq 'on' && (&haveBlueNet())){
print CLIENTCONF "remote $netsettings{'BLUE_ADDRESS'} $vpnsettings{'DDEST_PORT'}\r\n";
if ( $vpnsettings{'ENABLED_ORANGE'} eq 'on' && (&haveOrangeNet())){
- print CLIENTCONF "#Coment the above line and uncoment the next line, if you want to connect on the Orange interface\r\n";
+ print CLIENTCONF "#comment the above line and uncomment the next line, if you want to connect on the Orange interface\r\n";
print CLIENTCONF ";remote $netsettings{'ORANGE_ADDRESS'} $vpnsettings{'DDEST_PORT'}\r\n";
}
} elsif ( $vpnsettings{'ENABLED_ORANGE'} eq 'on' && (&haveOrangeNet())){
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2022-06-11 14:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4LL0k64qYlz2xsy@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox