* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1ebd84f4389a32ceec51e7ad64ca47d7de3c06be
@ 2020-09-29 13:52 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2020-09-29 13:52 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 10591 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 1ebd84f4389a32ceec51e7ad64ca47d7de3c06be (commit)
via df8920100d8e853f28e3b9aa29182596a79dc129 (commit)
from 898d6d87a2ab7076d31ba270529807cca4dc0284 (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 1ebd84f4389a32ceec51e7ad64ca47d7de3c06be
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Sep 29 13:49:59 2020 +0000
netother.cgi: Fix typo in Connection Tracking headline
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit df8920100d8e853f28e3b9aa29182596a79dc129
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Sep 29 13:47:09 2020 +0000
exoscale: Fix assigning domain name
The whole hostname was used as domain name because there
was no . in it where the string could have been split.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
doc/language_issues.de | 1 -
doc/language_issues.en | 2 +-
doc/language_issues.es | 1 -
doc/language_issues.fr | 1 -
doc/language_issues.it | 1 -
doc/language_issues.nl | 1 -
doc/language_issues.pl | 1 -
doc/language_issues.ru | 1 -
doc/language_issues.tr | 1 -
html/cgi-bin/netother.cgi | 2 +-
src/initscripts/helper/exoscale-setup | 9 ++++++---
11 files changed, 8 insertions(+), 13 deletions(-)
Difference in files:
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 74b1c4a90..f2a7ba8ae 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -767,7 +767,6 @@ WARNING: translation string unused: zoneconf val ppp assignment error
WARNING: translation string unused: zoneconf val vlan amount assignment error
WARNING: translation string unused: zoneconf val vlan tag assignment error
WARNING: translation string unused: zoneconf val zoneslave amount error
-WARNING: untranslated string: connnection tracking = unknown string
WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date!
WARNING: untranslated string: fwhost cust locationgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 1b2163e73..5b2e23def 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -493,7 +493,6 @@ WARNING: untranslated string: connection type = Connection Type
WARNING: untranslated string: connection type is invalid = Connection type is invalid.
WARNING: untranslated string: connections = Connections
WARNING: untranslated string: connections are associated with this ca. deleting the ca will delete these connections as well. = connections are associated with this CA. Deleting the CA will delete these connections as well.
-WARNING: untranslated string: connnection tracking = unknown string
WARNING: untranslated string: connscheduler = Connection Scheduler
WARNING: untranslated string: could not be opened = could not be opened.
WARNING: untranslated string: could not download latest updates = Could not download latest updates.
@@ -1465,6 +1464,7 @@ WARNING: untranslated string: pakfire tree = Repository
WARNING: untranslated string: pakfire tree stable = Stable
WARNING: untranslated string: pakfire tree testing = Testing
WARNING: untranslated string: pakfire tree unstable = Unstable
+WARNING: untranslated string: pakfire uninstall all = Do you want to uninstall the following packages?
WARNING: untranslated string: pakfire uninstall description = Please choose one or more items from the list below and <br /> click the minus to uninstall.
WARNING: untranslated string: pakfire uninstall package = You want to uninstall the following packages:
WARNING: untranslated string: pakfire working = Pakfire is working ... Please wait until all operations have completed successfully.
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 03a857cd3..e8b39de69 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -794,7 +794,6 @@ WARNING: untranslated string: ccd routes = Routing:
WARNING: untranslated string: ccd subnet = Subnet
WARNING: untranslated string: ccd used = Used addresses
WARNING: untranslated string: check all = Check all
-WARNING: untranslated string: connnection tracking = unknown string
WARNING: untranslated string: count = Count
WARNING: untranslated string: countries = Countries
WARNING: untranslated string: country codes and flags = Country Codes and Flags:
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index cdb089d31..2589fa74b 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -808,7 +808,6 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error
WARNING: translation string unused: zoneconf val vlan tag assignment error
WARNING: translation string unused: zoneconf val zoneslave amount error
WARNING: untranslated string: acpitemp = ACPI - Temperatures
-WARNING: untranslated string: connnection tracking = unknown string
WARNING: untranslated string: fwhost cust locationgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
WARNING: untranslated string: guardian block a host = unknown string
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 970d8a6f4..d47aafa14 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -833,7 +833,6 @@ WARNING: untranslated string: block = Block
WARNING: untranslated string: broken = Broken
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: check all = Check all
-WARNING: untranslated string: connnection tracking = unknown string
WARNING: untranslated string: cpu frequency = CPU frequency
WARNING: untranslated string: crypto error = Cryptographic error
WARNING: untranslated string: crypto warning = Cryptographic warning
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 009bc1488..db78163c8 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -827,7 +827,6 @@ WARNING: untranslated string: broken = Broken
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: capabilities = Capabilities
WARNING: untranslated string: check all = Check all
-WARNING: untranslated string: connnection tracking = unknown string
WARNING: untranslated string: cpu frequency = CPU frequency
WARNING: untranslated string: crypto error = Cryptographic error
WARNING: untranslated string: crypto warning = Cryptographic warning
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 03a857cd3..e8b39de69 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -794,7 +794,6 @@ WARNING: untranslated string: ccd routes = Routing:
WARNING: untranslated string: ccd subnet = Subnet
WARNING: untranslated string: ccd used = Used addresses
WARNING: untranslated string: check all = Check all
-WARNING: untranslated string: connnection tracking = unknown string
WARNING: untranslated string: count = Count
WARNING: untranslated string: countries = Countries
WARNING: untranslated string: country codes and flags = Country Codes and Flags:
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 7997b8562..ef929331a 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -797,7 +797,6 @@ WARNING: untranslated string: ccd subnet = Subnet
WARNING: untranslated string: ccd used = Used addresses
WARNING: untranslated string: check all = Check all
WARNING: untranslated string: community rules = Snort/VRT GPLv2 Community Rules
-WARNING: untranslated string: connnection tracking = unknown string
WARNING: untranslated string: count = Count
WARNING: untranslated string: countries = Countries
WARNING: untranslated string: country codes and flags = Country Codes and Flags:
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 6198d8516..ba5164cd6 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -816,7 +816,6 @@ WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Pro
WARNING: untranslated string: advproxy wpad view pac = Open PAC File
WARNING: untranslated string: broken = Broken
WARNING: untranslated string: bytes = unknown string
-WARNING: untranslated string: connnection tracking = unknown string
WARNING: untranslated string: cpu frequency = CPU frequency
WARNING: untranslated string: crypto error = Cryptographic error
WARNING: untranslated string: crypto warning = Cryptographic warning
diff --git a/html/cgi-bin/netother.cgi b/html/cgi-bin/netother.cgi
index 459979684..6524ad575 100755
--- a/html/cgi-bin/netother.cgi
+++ b/html/cgi-bin/netother.cgi
@@ -71,7 +71,7 @@ if ( $querry[0] eq "conntrack") {
&Header::closebox();
}
- &Header::openbox('100%', 'center', "$Lang::tr{'connnection tracking'}");
+ &Header::openbox('100%', 'center', "$Lang::tr{'connection tracking'}");
&Graphs::makegraphbox("netother.cgi", "conntrack", "day");
&Header::closebox();
diff --git a/src/initscripts/helper/exoscale-setup b/src/initscripts/helper/exoscale-setup
index 59859a6e9..24e98d38b 100644
--- a/src/initscripts/helper/exoscale-setup
+++ b/src/initscripts/helper/exoscale-setup
@@ -33,10 +33,13 @@ import_exoscale_configuration() {
# Set domainname
if ! grep -q "^DOMAINNAME=" /var/ipfire/main/settings; then
- local domainname="${hostname#*.}"
+ local domainname="localdomain"
- # Fall back to localdomain
- [ -z "${domainname}" ] && domainname="localdomain"
+ # If the hostname contains a dot we strip the last
+ # part and use it as our domain name
+ if [[ ${hostname} =~ "\." ]]; then
+ domainname="${hostname#*.}"
+ fi
echo "DOMAINNAME=${domainname}" >> /var/ipfire/main/settings
fi
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-09-29 13:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-29 13:52 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1ebd84f4389a32ceec51e7ad64ca47d7de3c06be Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox