eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 06:26:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #3121 from nextcloud/enh/noid/tz-was-moved

Browse source 
UTC was moved to Etc/UTC
This commit is contained in:
Simon L 2023-08-09 14:58:14 +02:00 • committed by GitHub
commit e8ab2c7026
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Containers/mastercontainer/start.sh
View file

@ -304,8 +304,8 @@ E.g. https://internal.ip.of.this.server:8080
If your server has port 80 and 8443 open and you point a domain to your server, you can get a valid certificate automatically by opening the Nextcloud AIO Interface via: If your server has port 80 and 8443 open and you point a domain to your server, you can get a valid certificate automatically by opening the Nextcloud AIO Interface via:
https://your-domain-that-points-to-this-server.tld:8443" https://your-domain-that-points-to-this-server.tld:8443"
# Set the timezone to UTC # Set the timezone to Etc/UTC
export TZ=UTC export TZ=Etc/UTC
# Fix apache startup # Fix apache startup
rm -f /var/run/apache2/httpd.pid rm -f /var/run/apache2/httpd.pid

2
php/src/Docker/DockerActionManager.php
View file

@ -317,7 +317,7 @@ class DockerActionManager
} }
} elseif ($out[1] === 'TIMEZONE') { } elseif ($out[1] === 'TIMEZONE') {
if ($this->configurationManager->GetTimezone() === '') { if ($this->configurationManager->GetTimezone() === '') {
$replacements[1] = 'UTC'; $replacements[1] = 'Etc/UTC';
} else { } else {
$replacements[1] = $this->configurationManager->GetTimezone(); $replacements[1] = $this->configurationManager->GetTimezone();
} }

2
php/templates/containers.twig
View file

@ -629,7 +629,7 @@
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}"> <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
<input class="button" type="submit" value="Submit timezone" onclick="return confirm('Are you sure that this is a valid timezone? Please double check by following the wikipedia article and checking the correct column since if not, it will break the startup since the database will not get correctly initialized and you will end in a startup loop.')" /> <input class="button" type="submit" value="Submit timezone" onclick="return confirm('Are you sure that this is a valid timezone? Please double check by following the wikipedia article and checking the correct column since if not, it will break the startup since the database will not get correctly initialized and you will end in a startup loop.')" />
</form> </form>
You need to make sure that the timezone that you enter is valid. An example is <b>Europe/Berlin</b>. You can get valid values by looking at the 'TZ database name' column of this list: <a href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List"><b>click here</b></a>.<br><br> You need to make sure that the timezone that you enter is valid. An example is <b>Europe/Berlin</b>. You can get valid values by looking at the 'TZ database name' column of this list: <a href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List"><b>click here</b></a>. The default is <b>Etc/UTC<b> if nothing is entered.<br><br>
{% else %} {% else %}
The timezone for Nextcloud is currently set to <b>{{ timezone }}</b>. You can reset the timezone again by clicking on the button below.<br><br/> The timezone for Nextcloud is currently set to <b>{{ timezone }}</b>. You can reset the timezone again by clicking on the button below.<br><br/>
<form method="POST" action="/api/configuration" class="xhr"> <form method="POST" action="/api/configuration" class="xhr">