nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2024-11-10 17:03:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix a few things

Browse source 
Signed-off-by: szaimen <szaimen@e.mail.de>
This commit is contained in:
szaimen 2022-03-22 19:34:16 +01:00
parent 55f4a8ec7f
commit 90ba2f7e92
5 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Containers/apache/Caddyfile
View file

@ -34,7 +34,9 @@
# Onlyoffice # Onlyoffice
route /onlyoffice/* { route /onlyoffice/* {
uri strip_prefix /onlyoffice uri strip_prefix /onlyoffice
reverse_proxy {$ONLYOFFICE_HOST}:80 reverse_proxy {$ONLYOFFICE_HOST}:80 {
header_up X-Forwarded-Host {http.request.host}/onlyoffice
}
} }
# Nextcloud # Nextcloud

4
Containers/nextcloud/entrypoint.sh
View file

@ -297,6 +297,10 @@ fi
# OnlyOffice # OnlyOffice
if [ "$ONLYOFFICE_ENABLED" = 'yes' ]; then if [ "$ONLYOFFICE_ENABLED" = 'yes' ]; then
while ! nc -z "$ONLYOFFICE_HOST" 80; do
echo "waiting for OnlyOffice to become available..."
sleep 5
done
if ! [ -d "/var/www/html/custom_apps/onlyoffice" ]; then if ! [ -d "/var/www/html/custom_apps/onlyoffice" ]; then
php /var/www/html/occ app:install onlyoffice php /var/www/html/occ app:install onlyoffice
elif [ "$(php /var/www/html/occ config:app:get onlyoffice enabled)" = "no" ]; then elif [ "$(php /var/www/html/occ config:app:get onlyoffice enabled)" = "no" ]; then

3
php/containers.json
View file

@ -131,7 +131,8 @@
"CLAMAV_HOST=nextcloud-aio-clamav", "CLAMAV_HOST=nextcloud-aio-clamav",
"ONLYOFFICE_ENABLED=%ONLYOFFICE_ENABLED%", "ONLYOFFICE_ENABLED=%ONLYOFFICE_ENABLED%",
"COLLABORA_ENABLED=%COLLABORA_ENABLED%", "COLLABORA_ENABLED=%COLLABORA_ENABLED%",
"TALK_ENABLED=%TALK_ENABLED%" "TALK_ENABLED=%TALK_ENABLED%",
"ONLYOFFICE_HOST=nextcloud-aio-onlyoffice"
], ],
"maxShutdownTime": 10, "maxShutdownTime": 10,
"restartPolicy": "unless-stopped" "restartPolicy": "unless-stopped"

1
php/src/Controller/DockerController.php
View file

@ -185,6 +185,7 @@ class DockerController
} }
} }
$this->StopDomaincheckContainer();
$this->PerformRecursiveContainerStart($id); $this->PerformRecursiveContainerStart($id);
// Cache the start for 10 minutes // Cache the start for 10 minutes

38
php/templates/containers.twig
View file

@ -82,10 +82,10 @@
{% if isAnyRunning == true %} {% if isAnyRunning == true %}
{% if isApacheStarting != true %} {% if isApacheStarting != true %}
<details> <details>
<summary>Click here to reveal the initial Nextcloud credentials</summary><br /><br /> <summary>Click here to reveal the initial Nextcloud credentials</summary><br />
Initial Nextcloud username: admin<br /> Initial Nextcloud username: admin<br />
Initial Nextcloud password: {{ nextcloud_password }}<br /><br/> Initial Nextcloud password: {{ nextcloud_password }}
</details> </details><br /><br />
<a href="https://{{ domain }}" class="button" target="_blank" rel="noopener">Open your Nextcloud ↗</a><br/> <a href="https://{{ domain }}" class="button" target="_blank" rel="noopener">Open your Nextcloud ↗</a><br/>
{% else %} {% else %}
{% if isAnyRestarting == false %} {% if isAnyRestarting == false %}
@ -208,16 +208,18 @@
<h3>Backup information</h3> <h3>Backup information</h3>
{% if has_backup_run_once == true %} {% if has_backup_run_once == true %}
<details> <details>
<summary>Click here to reveal the backup information</summary><br /><br/> <summary>Click here to reveal the backup information</summary><br />
{% endif %} {% endif %}
This is your encryption password for backups: {{ borgbackup_password }} <br /><br/> This is your encryption password for backups: {{ borgbackup_password }} <br /><br/>
Please save it at a safe place since you won't be able to restore from backup if you loose this password! <br /><br/> Please save it at a safe place since you won't be able to restore from backup if you loose this password! <br /><br/>
Backed up will get all important data of your Nextcloud AIO instance like the database, your files and configuration files of the mastercontainer and else. <br /><br/> Backed up will get all important data of your Nextcloud AIO instance like the database, your files and configuration files of the mastercontainer and else. <br /><br/>
The backup itself will use a tool that is called <a href="https://github.com/borgbackup/borg#what-is-borgbackup">BorgBackup<a/> which is a well-known server backup tool that efficiently backs up your files and encrypts them on the fly. <br /><br/> The backup itself will use a tool that is called <a href="https://github.com/borgbackup/borg#what-is-borgbackup">BorgBackup<a/> which is a well-known server backup tool that efficiently backs up your files and encrypts them on the fly. <br /><br/>
Backups get created in the following directory on the host: {{ borg_backup_host_location }}/borg <br /><br/> Backups get created in the following directory on the host: {{ borg_backup_host_location }}/borg <br /><br/>
Be aware that this solution does not back up files and folders that are mounted into Nextcloud using the external storage app. <br /><br/> Be aware that this solution does not back up files and folders that are mounted into Nextcloud using the external storage app.
{% if has_backup_run_once == true %} {% if has_backup_run_once == false %}
</details> <br /><br />
{% else %}
</details><br /><br />
{% endif %} {% endif %}
{% if isApacheStarting != true %} {% if isApacheStarting != true %}
@ -285,7 +287,7 @@
{% if isApacheStarting == false %} {% if isApacheStarting == false %}
<h3>AIO password change</h3> <h3>AIO password change</h3>
<details> <details>
<summary>Click here to change your AIO password</summary><br><br /> <summary>Click here to change your AIO password</summary><br>
You can change your AIO password below:<br><br /> You can change your AIO password below:<br><br />
<form method="POST" action="/api/configuration" class="xhr"> <form method="POST" action="/api/configuration" class="xhr">
<input type="text" autocomplete="current-password" name="current-master-password" placeholder="Your current AIO password"/> <input type="text" autocomplete="current-password" name="current-master-password" placeholder="Your current AIO password"/>
@ -294,8 +296,8 @@
<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" /> <input class="button" type="submit" value="Submit" />
</form> </form>
The new password needs to be at least 24 characters long. Allowed characters are the <a href="https://en.wikipedia.org/wiki/Latin_alphabet#/media/File:Abecedarium.png"><b>latin characters</b></a> <b>a-z</b>, <b>A-Z</b>, <b>0-9</b> and <b>spaces</b>.<br><br> The new password needs to be at least 24 characters long. Allowed characters are the <a href="https://en.wikipedia.org/wiki/Latin_alphabet#/media/File:Abecedarium.png"><b>latin characters</b></a> <b>a-z</b>, <b>A-Z</b>, <b>0-9</b> and <b>spaces</b>.
</details> </details><br /><br />
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -308,24 +310,24 @@
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}"> <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
<input type="hidden" name="options-form" value="options-form"> <input type="hidden" name="options-form" value="options-form">
{% if is_clamav_enabled == true %} {% if is_clamav_enabled == true %}
<input type="checkbox" id="clamav" name="clamav" checked="checked"><label for="clamav">ClamAV (only supported on x64, needs ~2GB additional RAM)</label> <input type="checkbox" id="clamav" name="clamav" checked="checked"><label for="clamav">ClamAV (only supported on x64, needs ~2GB additional RAM)</label><br>
{% else %} {% else %}
<input type="checkbox" id="clamav" name="clamav"><label for="clamav">ClamAV (only supported on x64, needs ~2GB additional RAM)</label> <input type="checkbox" id="clamav" name="clamav"><label for="clamav">ClamAV (only supported on x64, needs ~2GB additional RAM)</label><br>
{% endif %} {% endif %}
{% if is_collabora_enabled == true %} {% if is_collabora_enabled == true %}
<input type="checkbox" id="collabora" name="collabora" checked="checked"><label for="collabora">Collabora</label> <input type="checkbox" id="collabora" name="collabora" checked="checked"><label for="collabora">Collabora</label><br>
{% else %} {% else %}
<input type="checkbox" id="collabora" name="collabora"><label for="collabora">Collabora</label> <input type="checkbox" id="collabora" name="collabora"><label for="collabora">Collabora</label><br>
{% endif %} {% endif %}
{% if is_onlyoffice_enabled == true %} {% if is_onlyoffice_enabled == true %}
<input type="checkbox" id="onlyoffice" name="onlyoffice" checked="checked"><label for="onlyoffice">OnlyOffice (only supported on x64)</label> <input type="checkbox" id="onlyoffice" name="onlyoffice" checked="checked"><label for="onlyoffice">OnlyOffice (only supported on x64)</label><br>
{% else %} {% else %}
<input type="checkbox" id="onlyoffice" name="onlyoffice"><label for="onlyoffice">OnlyOffice (only supported on x64)</label> <input type="checkbox" id="onlyoffice" name="onlyoffice"><label for="onlyoffice">OnlyOffice (only supported on x64)</label><br>
{% endif %} {% endif %}
{% if is_talk_enabled == true %} {% if is_talk_enabled == true %}
<input type="checkbox" id="talk" name="talk" checked="checked"><label for="talk">Nextcloud Talk (needs ports 3478/TCP and 3478/UDP open in your firewall/router)</label> <input type="checkbox" id="talk" name="talk" checked="checked"><label for="talk">Nextcloud Talk (needs ports 3478/TCP and 3478/UDP open in your firewall/router)</label><br>
{% else %} {% else %}
<input type="checkbox" id="talk" name="talk"><label for="talk">Nextcloud Talk (needs ports 3478/TCP and 3478/UDP open in your firewall/router)</label> <input type="checkbox" id="talk" name="talk"><label for="talk">Nextcloud Talk (needs ports 3478/TCP and 3478/UDP open in your firewall/router)</label><br>
{% endif %} {% endif %}
<input id="options-form-submit" class="button" type="submit" value="Save changes" /> <input id="options-form-submit" class="button" type="submit" value="Save changes" />
</form> </form>