From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9acda8fa69b22f410b2b3787b7fad5cff899488d
Date: Wed, 06 May 2015 16:58:04 +0200 [thread overview]
Message-ID: <20150506145805.2104322311@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1874 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 9acda8fa69b22f410b2b3787b7fad5cff899488d (commit)
via 1d47c971e6bd4490fb54c6dd333f307d89f9cfee (commit)
from 0ed7b61325996686b956ba398ccb830b53253253 (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 9acda8fa69b22f410b2b3787b7fad5cff899488d
Merge: 0ed7b61 1d47c97
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed May 6 16:57:55 2015 +0200
Merge remote-tracking branch 'amarx/BUG10834' into next
commit 1d47c971e6bd4490fb54c6dd333f307d89f9cfee
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Wed May 6 16:18:00 2015 +0200
BUG10834: fixes ovpn-ccd-convert
When restoring an old backup, all OpenVPN RW's get the dynamic network.
-----------------------------------------------------------------------
Summary of changes:
src/scripts/ovpn-ccd-convert | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Difference in files:
diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert
index 7aa8cf1..f496706 100644
--- a/src/scripts/ovpn-ccd-convert
+++ b/src/scripts/ovpn-ccd-convert
@@ -42,7 +42,7 @@ foreach my $key (keys %ovpnconfig){
}else{
print "Client $ovpnconfig{$key}[2] NOT converted!\n";
}
- $ovpnconfig{$key}[32] = 'dynamic';
+ $ovpnconfig{$key}[32] = 'dynamic' if ($ovpnconfig{$key}[32] eq '');
}
&General::writehasharray("/var/ipfire/ovpn/ovpnconfig", \%ovpnconfig);
if ($running eq 'on')
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2015-05-06 14:58 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=20150506145805.2104322311@argus.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