From bc6dfe871101801031ec0e60334e3599ed589797 Mon Sep 17 00:00:00 2001 From: Jean-Yves <7360784+docjyJ@users.noreply.github.com> Date: Mon, 29 Jul 2024 17:44:32 +0200 Subject: [PATCH] Update Tags Signed-off-by: Jean-Yves <7360784+docjyJ@users.noreply.github.com> Signed-off-by: Simon L. --- php/public/style.css | 65 ++--- php/templates/containers.twig | 343 ++++++++++++------------ php/templates/includes/aio-config.twig | 56 ++-- php/templates/includes/backup-dirs.twig | 12 +- php/templates/login.twig | 2 +- php/templates/setup.twig | 2 +- 6 files changed, 243 insertions(+), 237 deletions(-) diff --git a/php/public/style.css b/php/public/style.css index b9418737712..d4c25a8ed06 100644 --- a/php/public/style.css +++ b/php/public/style.css @@ -9,12 +9,13 @@ a { color: #0082c9; } -.button { +a.button, +input[type="submit"] { padding: 6px 16px; width: auto; min-height: 34px; cursor: pointer; - background-color:#0082c9; + background-color: #0082c9; font-weight: bold; border-radius: 100px; margin: 3px 3px 3px 0; @@ -24,15 +25,12 @@ a { outline: none; } -.button:focus { - color:black; +a.button:focus, +input[type="submit"]:focus { + color: black; border: 2px solid black; } -#logout { - margin-top: 7px; -} - summary { cursor: pointer; } @@ -88,8 +86,7 @@ div.toast { position: fixed; z-index: 1000; border-radius: 3px; - background: none; - background-color: white; + background: white none; } .login { @@ -108,12 +105,18 @@ div.toast { font-size: 17px; } +form { + margin: 0; +} + input { padding: 10px; + margin-top: 15px; margin-bottom: 15px; } -.login > form > input { +.login > form > input[type="password"], +.login > form > input[type="text"] { width: 100%; } @@ -123,7 +126,8 @@ input { display: block; } -.login > .button { +.login > a.button , +.login > input[type="submit"] { margin-left: auto; margin-right: auto; display: block; @@ -146,7 +150,7 @@ input { position: relative; } -.content { +main { padding: 20px; max-width: 100%; word-break: break-word; @@ -173,6 +177,7 @@ header { background-image: linear-gradient(40deg, #0082c9 0%, #30b6ff 100%); height: 50px; justify-content: space-between; + align-items: center; display: flex; } @@ -181,18 +186,18 @@ header { } #overlay { - position: fixed; /* Sit on top of the page content */ - display: none; /* Hidden by default */ - width: 100%; /* Full width (cover the whole page) */ - height: 100%; /* Full height (cover the whole page) */ - top: 0; - left: 0; - background-color: rgba(0,0,0,0.5); /* Black background with opacity */ - z-index: 2; + position: fixed; /* Sit on top of the page content */ + display: none; /* Hidden by default */ + width: 100%; /* Full width (cover the whole page) */ + height: 100%; /* Full height (cover the whole page) */ + top: 0; + left: 0; + background-color: rgba(0, 0, 0, 0.5); /* Black background with opacity */ + z-index: 2; } #overlay.loading { - display: block; + display: block; } .loader { @@ -206,15 +211,15 @@ header { position: absolute; top: calc(50% - 60px); left: calc(50% - 60px); - } - - /* Safari */ - @-webkit-keyframes spin { +} + +/* Safari */ +@-webkit-keyframes spin { 0% { -webkit-transform: rotate(0deg); } 100% { -webkit-transform: rotate(360deg); } - } - - @keyframes spin { +} + +@keyframes spin { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } - } +} diff --git a/php/templates/containers.twig b/php/templates/containers.twig index bedfd481790..91e18424671 100644 --- a/php/templates/containers.twig +++ b/php/templates/containers.twig @@ -11,11 +11,11 @@
- +
-
+

Nextcloud AIO v9.4.1

{# Add 2nd tab warning #} @@ -58,107 +58,107 @@ {% endfor %} {% if is_daily_backup_running == true %} - Daily backup currently running. (Logs)

+

Daily backup currently running. (Logs)

{% if automatic_updates == true %} - This will update your containers, the mastercontainer and, on Saturdays, your Nextcloud apps if the backup is successful.

+

This will update your containers, the mastercontainer and, on Saturdays, your Nextcloud apps if the backup is successful.

{% if is_mastercontainer_update_available == true %} - When the mastercontainer is updated it will restart, making it unavailable for a moment. (Logs)

+

When the mastercontainer is updated it will restart, making it unavailable for a moment. (Logs)

{% endif %} {% endif %} {% if has_update_available == false %} - The whole process should not take more than a few minutes.

+

The whole process should not take more than a few minutes.

{% elseif automatic_updates == true %} - The whole process can take a while as your containers will be updated.

+

The whole process can take a while as your containers will be updated.

{% endif %} - Reload ↻

- If the daily backup is stuck somehow, you can unstick it by running sudo docker exec nextcloud-aio-mastercontainer rm /mnt/docker-aio-config/data/daily_backup_running and afterwards reloading this interface.

+

Reload ↻

+

If the daily backup is stuck somehow, you can unstick it by running sudo docker exec nextcloud-aio-mastercontainer rm /mnt/docker-aio-config/data/daily_backup_running and afterwards reloading this interface.

{% elseif isWatchtowerRunning == true %} - Mastercontainer update currently running. Once the update is complete the mastercontainer will restart, making it unavailable for a moment. Please wait until it's done. (Logs)

- Reload ↻
+

Mastercontainer update currently running. Once the update is complete the mastercontainer will restart, making it unavailable for a moment. Please wait until it's done. (Logs)

+

Reload ↻

{% else %} {% if is_backup_container_running == false and domain == "" %} {% if isDomaincheckRunning == false %}

Domaincheck container is not running

- This is not expected. Most likely this happened because port {{ apache_port }} is already in use on your server. You can check the mastercontainer logs and domaincheck container logs for further clues. You should be able to resolve this by adjusting the APACHE_PORT by following the reverse proxy documentation. Advice: have a detailed look at the changed docker run command for AIO. +

This is not expected. Most likely this happened because port {{ apache_port }} is already in use on your server. You can check the mastercontainer logs and domaincheck container logs for further clues. You should be able to resolve this by adjusting the APACHE_PORT by following the reverse proxy documentation. Advice: have a detailed look at the changed docker run command for AIO.

{% elseif is_mastercontainer_update_available == true %}

Mastercontainer update

- ⚠️ A mastercontainer update is available. Please click on the button below to update it. Afterwards, you will be able to proceed with the setup.

+

⚠️ A mastercontainer update is available. Please click on the button below to update it. Afterwards, you will be able to proceed with the setup.

- +
{% else %} {% if borg_backup_host_location == '' and borg_restore_password == '' %} - The official Nextcloud installation method. Nextcloud All-in-One provides easy deployment and maintenance with most features included in this one Nextcloud instance.

- You can either create a new AIO instance or restore a former AIO instance from backup. See the two sections below.

+

The official Nextcloud installation method. Nextcloud All-in-One provides easy deployment and maintenance with most features included in this one Nextcloud instance.

+

You can either create a new AIO instance or restore a former AIO instance from backup. See the two sections below.

{{ include('includes/aio-config.twig') }}

New AIO instance

{% if apache_port == '443' %} - AIO is currently in "normal mode" which means that it handles the TLS proxying itself. This also means that it cannot be installed behind a web server or reverse proxy (like Apache, Nginx, Caddy, Cloudflare Tunnel and else). If you want to run AIO behind a web server or reverse proxy (like Apache, Nginx, Caddy, Cloudflare Tunnel and else), see the reverse proxy documentation. Advice: have a detailed look at the changed docker run command for AIO.

+

AIO is currently in "normal mode" which means that it handles the TLS proxying itself. This also means that it cannot be installed behind a web server or reverse proxy (like Apache, Nginx, Caddy, Cloudflare Tunnel and else). If you want to run AIO behind a web server or reverse proxy (like Apache, Nginx, Caddy, Cloudflare Tunnel and else), see the reverse proxy documentation. Advice: have a detailed look at the changed docker run command for AIO.

{% else %} - AIO is currently in "reverse proxy mode" which means that it can be installed behind a web server or reverse proxy (like Apache, Nginx, Caddy, Cloudflare Tunnel and else) and does not do the TLS proxying itself.

+

AIO is currently in "reverse proxy mode" which means that it can be installed behind a web server or reverse proxy (like Apache, Nginx, Caddy, Cloudflare Tunnel and else) and does not do the TLS proxying itself.

{% endif %} - Please type the domain that will be used for Nextcloud below in order to create a new AIO instance.

+

Please type the domain that will be used for Nextcloud below in order to create a new AIO instance.

{% if skip_domain_validation == true %} - Please note: The domain validation is disabled so any domain will be accepted here! Make sure you do not make a typo here as you will not be able to change it afterwards!

+

Please note: The domain validation is disabled so any domain will be accepted here! Make sure you do not make a typo here as you will not be able to change it afterwards!

{% endif %}
- +
{% if skip_domain_validation == false %} - Make sure that this server is reachable on port 443 (port 443/tcp is open/forwarded in your firewall/router and 443/udp as well if you want to enable http3) and that you've correctly set up the DNS config for the domain that you enter (set the A record to your public ipv4-address and if you need ipv6, set the AAAA record to your public ipv6-address. A CNAME record is, of course, also possible). You should see hints on what went wrong in the top right corner if your domain is not accepted.

+

Make sure that this server is reachable on port 443 (port 443/tcp is open/forwarded in your firewall/router and 443/udp as well if you want to enable http3) and that you've correctly set up the DNS config for the domain that you enter (set the A record to your public ipv4-address and if you need ipv6, set the AAAA record to your public ipv6-address. A CNAME record is, of course, also possible). You should see hints on what went wrong in the top right corner if your domain is not accepted.

- Click here for further hints
- If you do not have a domain yet, you can get one for free e.g. from duckdns.org and others.

- If you have a dynamic public IP-address, you can use e.g. DDclient with a compatible domain provider for DNS updates.

- If you only want to install AIO locally without exposing it to the public internet or if you cannot do so, feel free to follow this documentation.

- If you should be using Cloudflare Proxy for your domain, make sure to disable the Proxy feature temporarily as it might block the domain validation attempts.

+ Click here for further hints +

If you do not have a domain yet, you can get one for free e.g. from duckdns.org and others.

+

If you have a dynamic public IP-address, you can use e.g. DDclient with a compatible domain provider for DNS updates.

+

If you only want to install AIO locally without exposing it to the public internet or if you cannot do so, feel free to follow this documentation.

+

If you should be using Cloudflare Proxy for your domain, make sure to disable the Proxy feature temporarily as it might block the domain validation attempts.

{% if apache_port != '443' %} - If you run into issues with your domain being accepted, see these steps for how to debug things.

+

If you run into issues with your domain being accepted, see these steps for how to debug things.

{% endif %} - Hint: If the domain validation fails but you are completely sure that you've configured everything correctly, you may skip the domain validation by following this documentation.
+

Hint: If the domain validation fails but you are completely sure that you've configured everything correctly, you may skip the domain validation by following this documentation.

{% endif %}

Restore former AIO instance from backup

- You can alternatively restore a former AIO instance from backup.

+

You can alternatively restore a former AIO instance from backup.

{% endif %} {% if is_instance_restore_attempt == false %} {% if borg_backup_host_location != '' and borg_restore_password != '' %} {% if borg_backup_mode in ['test', 'check'] %} {% if backup_exit_code > 0 %} - Last {{ borg_backup_mode }} failed! (Logs)

+

Last {{ borg_backup_mode }} failed! (Logs)

{% if borg_backup_mode == 'test' %} - Please adjust the path and/or the encryption password in order to make it work!

+

Please adjust the path and/or the encryption password in order to make it work!

{% elseif borg_backup_mode == 'check' %} - The backup archive seems to be corrupt. Please try to use a different intact backup archive or try to fix it by following this documentation

+

The backup archive seems to be corrupt. Please try to use a different intact backup archive or try to fix it by following this documentation

- Reveal repair option
- Below is the option to repair the integrity of your backup. Please note: Please only use this after you have read the documentation above! (It will run the command 'borg check --repair' for you.)

+ Reveal repair option +

Below is the option to repair the integrity of your backup. Please note: Please only use this after you have read the documentation above! (It will run the command 'borg check --repair' for you.)

-
-

-

+ + + {% endif %} {% elseif backup_exit_code == 0 %} - Last {{ borg_backup_mode }} successful! (Logs)

+

Last {{ borg_backup_mode }} successful! (Logs)

{% if borg_backup_mode == 'test' %} - Feel free to check the integrity of the backup archive below before starting the restore process in order to make ensure that the restore will work. This can take a long time though depending on the size of the backup archive and is thus not required.

+

Feel free to check the integrity of the backup archive below before starting the restore process in order to make ensure that the restore will work. This can take a long time though depending on the size of the backup archive and is thus not required.

-
+
{% endif %} - Choose the backup that you want to restore and click on the button below to restore the selected backup. This will restore the whole AIO instance. Please note that the current AIO passphrase will be kept and the previous AIO passphrase will not be restored from backup!

- Please note: If the backup that you want to restore contained any community container, but you did not specify the same community containers via environmental variable while creating this new AIO instance, you need to restore the same backup a second time after this attempt so that the community container data is also correctly restored.

+

Choose the backup that you want to restore and click on the button below to restore the selected backup. This will restore the whole AIO instance. Please note that the current AIO passphrase will be kept and the previous AIO passphrase will not be restored from backup!

+

Please note: If the backup that you want to restore contained any community container, but you did not specify the same community containers via environmental variable while creating this new AIO instance, you need to restore the same backup a second time after this attempt so that the community container data is also correctly restored.

@@ -167,53 +167,53 @@ {% endfor %} - +
{% endif %} {% elseif borg_backup_mode == 'restore' %} {% if backup_exit_code > 0 %} - Last restore failed! (Logs)

- The restore process has unexpectedly failed! Please adjust the path and encryption password, test it and try to restore again! +

Last restore failed! (Logs)

+

The restore process has unexpectedly failed! Please adjust the path and encryption password, test it and try to restore again!

{% endif %} {% endif %} {% endif %} {% if borg_backup_host_location == '' or borg_restore_password == '' or borg_backup_mode not in ['test', 'check', ''] or backup_exit_code > 0 %} - Please enter the location of the backup archive on your host and the encryption password of the backup archive below:

+

Please enter the location of the backup archive on your host and the encryption password of the backup archive below:

- +
{{ include('includes/backup-dirs.twig') }} - ⚠️ Please note that the backup archive must be located in a subfolder of the folder that you enter here and the subfolder which contains the archive must be named 'borg', or the backup container will not be able to find the backup archive!

+

⚠️ Please note that the backup archive must be located in a subfolder of the folder that you enter here and the subfolder which contains the archive must be named 'borg', or the backup container will not be able to find the backup archive!

{% endif %} {% else %} - Everything set! Click on the button below to test the path and encryption password:

+

Everything set! Click on the button below to test the path and encryption password:

-
+
{% endif %} {% endif %}

How to reset the AIO instance?

- If something should be going wrong, for example during the initial installation, you can reset the instance by following this documentation.

+

If something should be going wrong, for example during the initial installation, you can reset the instance by following this documentation.

{% endif %} {% if was_start_button_clicked == true %} {% if current_channel starts with 'latest' or current_channel starts with 'beta' or current_channel starts with 'develop' %} - You are running the {{ current_channel }} channel. (Logs)

+

You are running the {{ current_channel }} channel. (Logs)

{% else %} - No channel was found. This means that AIO is not able to update itself and its component and will also not be able to report about updates. Updates need to be done externally. +

No channel was found. This means that AIO is not able to update itself and its component and will also not be able to report about updates. Updates need to be done externally.

{% endif %} {% endif %} {% if is_backup_container_running == true %} - Backup container is currently running: {{ borg_backup_mode }} (Logs)

- Reload ↻

+

Backup container is currently running: {{ borg_backup_mode }} (Logs)

+

Reload ↻

{% endif %} {% if domain != "" %} @@ -221,31 +221,30 @@ {% if isApacheStarting != true %} {% if borg_backup_host_location != '' %}
- Click here to reveal the initial Nextcloud credentials
+ Click here to reveal the initial Nextcloud credentials {% endif %} - Initial Nextcloud username: admin
- Initial Nextcloud password: +

Initial Nextcloud username: admin

{% if borg_backup_host_location != '' %} {# nextcloud_password needs to be duplicated due to a bug in Firefox. See https://github.com/nextcloud/all-in-one/issues/638. #} - {{ nextcloud_password }}

+

Initial Nextcloud password: {{ nextcloud_password }}

{% else %} - {{ nextcloud_password }}

+

Initial Nextcloud password: {{ nextcloud_password }}

{% endif %} - Open your Nextcloud ↗

+

Open your Nextcloud ↗

{% if borg_backup_host_location == '' %} - If your Nextcloud does not open when clicking the button above, see this documentation

+

If your Nextcloud does not open when clicking the button above, see this documentation

{% endif %} {% else %} {% if isAnyRestarting == false %} - Containers are currently starting. You might inspect the container logs by clicking on Starting next to each container for further details.

- Reload ↻

+

Containers are currently starting. You might inspect the container logs by clicking on Starting next to each container for further details.

+

Reload ↻

{% else %} - It seems at least one container was not able to start correctly and is currently restarting.

- To break this endless loop, you can stop the containers below and investigate the issue in the container logs before starting the containers again.

+

It seems at least one container was not able to start correctly and is currently restarting.

+

To break this endless loop, you can stop the containers below and investigate the issue in the container logs before starting the containers again.

- +
{% endif %} {% endif %} @@ -291,16 +290,16 @@ {% if has_update_available == true %} {% if is_mastercontainer_update_available == false %} - ⚠️ Container updates are available. Click on Stop containers and Start and update containers to update them. You should consider creating a backup first.

+

⚠️ Container updates are available. Click on Stop containers and Start and update containers to update them. You should consider creating a backup first.

{% endif %} {% else %} {% if is_mastercontainer_update_available == false %} - Your containers are up-to-date.

+

Your containers are up-to-date.

{% if newMajorVersion != '' and isAnyRunning == true and isApacheStarting != true %}
- Note about Nextcloud {{ newMajorVersion }}
- If you haven't upgraded to Nextcloud {{ newMajorVersion }} yet and want to do that now, feel free to follow this documentation
-

+ Note about Nextcloud {{ newMajorVersion }} +

If you haven't upgraded to Nextcloud {{ newMajorVersion }} yet and want to do that now, feel free to follow this documentation

+ {% endif %} {% endif %} {% endif %} @@ -309,34 +308,34 @@ {% if isAnyRunning == true %} {% if isApacheStarting != true %} {% if is_mastercontainer_update_available == true %} - ⚠️ A mastercontainer update is available. Please click on the button below to stop your containers in order to update the mastercontainer.

+

⚠️ A mastercontainer update is available. Please click on the button below to stop your containers in order to update the mastercontainer.

{% if current_channel starts with 'latest' %} - You can find the changelog here

+

You can find the changelog here

{% elseif current_channel starts with 'beta' %} - You can find the changelog here

+

You can find the changelog here

{% elseif current_channel starts with 'develop' %} - You can find all changes here

+

You can find all changes here

{% endif %} {% endif %}
- +
{% endif %} {% else %} {% if isBackupOrRestoreRunning == true %} - Restore or Backup currently running. Cannot start the containers until Restore or Backup is complete.

+

Restore or Backup currently running. Cannot start the containers until Restore or Backup is complete.

{% else %} {% if was_start_button_clicked == false %} -
Clicking on the button below will download all docker containers and start them. This can take a long time depending on your internet connection. Since the overall size is a few GB, this can take around 5-10 min or more. Please be patient!

+

Clicking on the button below will download all docker containers and start them. This can take a long time depending on your internet connection. Since the overall size is a few GB, this can take around 5-10 min or more. Please be patient!

{% endif %} {% if is_mastercontainer_update_available == true %} - ⚠️ A mastercontainer update is available. Please click on the button below to update it.

+

⚠️ A mastercontainer update is available. Please click on the button below to update it.

- +
{% else %} {% if was_start_button_clicked == false %} @@ -346,13 +345,13 @@ {% if newMajorVersion != '' %}
{% endif %} - + {% elseif has_update_available == false %}
- +
{% else %}
@@ -369,16 +368,16 @@ {% if is_backup_section_enabled == false %}

Backup and restore

- The backup section is disabled via environmental variable.

+

The backup section is disabled via environmental variable.

{% else %} {% if is_backup_container_running == false and borg_backup_host_location == "" and isApacheStarting != true %}

Backup and restore

- Please enter the directory path below where backups will be created on the host system. It's best to choose a location on a separate drive and not on your root drive.

+

Please enter the directory path below where backups will be created on the host system. It's best to choose a location on a separate drive and not on your root drive.

- +
{{ include('includes/backup-dirs.twig') }} {% endif %} @@ -390,33 +389,33 @@ {% if is_backup_container_running == false %}

Backup and restore

{% if backup_exit_code > 0 %} - Last {{ borg_backup_mode }} failed! (Logs)

+

Last {{ borg_backup_mode }} failed! (Logs)

{% if borg_backup_mode == "check" %} - The backup check was not successful. This might indicate a corrupt archive (look at the logs). If that should be the case, you can try to fix it by following this documentation

+

The backup check was not successful. This might indicate a corrupt archive (look at the logs). If that should be the case, you can try to fix it by following this documentation

- Reveal repair option
- Below is the option to repair the integrity of your backup. Please note: Please only use this after you have read the documentation above! (It will run the command 'borg check --repair' for you.)

+ Reveal repair option +

Below is the option to repair the integrity of your backup. Please note: Please only use this after you have read the documentation above! (It will run the command 'borg check --repair' for you.)

-
-

-

+ + + {% endif %} {% if has_backup_run_once == false %} - You may change the backup path again since the initial backup was not successful. After submitting the new value, you need to click on Create Backup to test the new value.

+

You may change the backup path again since the initial backup was not successful. After submitting the new value, you need to click on Create Backup to test the new value.

- +
{% endif %} {% elseif backup_exit_code == 0 %} {% if borg_backup_mode == "backup" %} - Last {{ borg_backup_mode }} successful on {{ last_backup_time }} UTC! (Logs)

+

Last {{ borg_backup_mode }} successful on {{ last_backup_time }} UTC! (Logs)

{% else %} - Last {{ borg_backup_mode }} successful! (Logs)

+

Last {{ borg_backup_mode }} successful! (Logs)

{% endif %} {% endif %} {% endif %} @@ -424,51 +423,51 @@ {% if is_backup_container_running == false and isApacheStarting == false %} {% if has_backup_run_once == true %}
- Click here to reveal all backup options (including an option for automatic updates)
+ Click here to reveal all backup options (including an option for automatic updates) {% endif %}

Backup information

- This is your encryption password for backups: {{ borgbackup_password }}

- Please save this password in a safe place. You won't be able to restore from backup if you lose this password!

- All important data from your Nextcloud AIO instance such as the database, your files and the mastercontainer's configuration files, will be backed up.

- The backup uses a tool called BorgBackup, a well-known server backup tool that efficiently backs up your files and encrypts them on the fly.

- By using this tool, backups are incremental, differential, compressed and encrypted – so only the first backup will take a while. Further backups should be fast as only changes are taken into account.

- Backups will be created in the following directory on the host: {{ borg_backup_host_location }}/borg

- Be aware that this solution does not backup files and folders that are mounted into Nextcloud using the external storage app, but you can add further Docker volumes and host paths that you want to back up after the initial backup is done.

- For information about backup retention, see this.

- Daily backups can be enabled after the initial backup is done. Enabling this also allows you to enable an option to update all containers, Nextcloud, and its apps automatically.

- For further documentation and options on this backup solution refer to this section and below.
+

This is your encryption password for backups: {{ borgbackup_password }}

+

Please save this password in a safe place. You won't be able to restore from backup if you lose this password!

+

All important data from your Nextcloud AIO instance such as the database, your files and the mastercontainer's configuration files, will be backed up.

+

The backup uses a tool called BorgBackup, a well-known server backup tool that efficiently backs up your files and encrypts them on the fly.

+

By using this tool, backups are incremental, differential, compressed and encrypted – so only the first backup will take a while. Further backups should be fast as only changes are taken into account.

+

Backups will be created in the following directory on the host: {{ borg_backup_host_location }}/borg

+

Be aware that this solution does not backup files and folders that are mounted into Nextcloud using the external storage app, but you can add further Docker volumes and host paths that you want to back up after the initial backup is done.

+

For information about backup retention, see this.

+

Daily backups can be enabled after the initial backup is done. Enabling this also allows you to enable an option to update all containers, Nextcloud, and its apps automatically.

+

For further documentation and options on this backup solution refer to this section and below.

{% if isApacheStarting != true %}

Backup creation

- Clicking on the button below will create a backup.

+

Clicking on the button below will create a backup.

- +
{% if has_backup_run_once == false %}

Reset backup host location

- If the configured backup host location {{ borg_backup_host_location }} is wrong, you can reset it by clicking on the button below.

+

If the configured backup host location {{ borg_backup_host_location }} is wrong, you can reset it by clicking on the button below.

- +
{% endif %} {% if has_backup_run_once == true %}

Backup check

- Click on the button below to perform a backup integrity check. This is an option that verifies that your backup is intact. It shouldn't be needed in most situations.

+

Click on the button below to perform a backup integrity check. This is an option that verifies that your backup is intact. It shouldn't be needed in most situations.

-
+

Backup restore

- Choose the backup that you want to restore and click on the button below to restore the selected backup. This will overwrite all your files with the chosen backup so you should consider creating a backup first. You can run an integrity check before restoring your files but this shouldn't be needed in most situations. Please note that this will not restore additionally chosen backup directories! The restore process should be pretty fast as rsync, which only transfers changed files, is used to restore the chosen backup.

+

Choose the backup that you want to restore and click on the button below to restore the selected backup. This will overwrite all your files with the chosen backup so you should consider creating a backup first. You can run an integrity check before restoring your files but this shouldn't be needed in most situations. Please note that this will not restore additionally chosen backup directories! The restore process should be pretty fast as rsync, which only transfers changed files, is used to restore the chosen backup.

@@ -477,53 +476,51 @@ {% endfor %} - +

Daily backup and automatic updates

{% if daily_backup_time == "" %} - By entering a time below, you can enable daily backups. It will create them at the entered time in 24h format. E.g. 04:00 will create backups at 4 am UTC and 16:00 at 4 pm UTC. When creating the backup, containers will be stopped and restarted after the backup is complete.

+

By entering a time below, you can enable daily backups. It will create them at the entered time in 24h format. E.g. 04:00 will create backups at 4 am UTC and 16:00 at 4 pm UTC. When creating the backup, containers will be stopped and restarted after the backup is complete.

-
+

-
+
{% else %} - Daily backups will be created at {{ daily_backup_time }} UTC. A notification about the result of the backup will be sent. +

Daily backups will be created at {{ daily_backup_time }} UTC. A notification about the result of the backup will be sent.

{% if automatic_updates == true %} - Also your containers, the mastercontainer and, on Saturdays, your Nextcloud apps will be automatically updated. + Also your containers, the mastercontainer and, on Saturdays, your Nextcloud apps will be automatically updated. {% endif %} - To change your backup time first disable Daily Backups, then enter your new backup time, and then re-enable them.

+

To change your backup time first disable Daily Backups, then enter your new backup time, and then re-enable them.

- +
{% endif %}

Back up additional directories and docker volumes of your host

- Below you can enter directories and docker volumes of your host that will be backed up into the same borg backup archive.

+

Below you can enter directories and docker volumes of your host that will be backed up into the same borg backup archive.

-
+
- Each line and entry needs to start with a slash or letter/digit. Only a-z, A-Z, ., 0-9, _, -, and / are allowed. If the entry begins with a letter/digit slashes are not supported. Two valid entries are /directory/on/the/host and my_custom_docker_volume. You need to make sure that all given directories exist or the backup container will fail to start!

- Be sure to individually specify all storage that you want to back up as storage will not be mounted recursively. E.g. providing / as additional backup directory will only back up files and folders that are stored on the root partition and not on the EFI partition or any other. Excluded by the backup will be caches and a few other directories. If you want to back up the root partition you should make sure to stop all services before the backup so it can run correctly. For automating this see this documentation

- Please note that the chosen directories/volumes will not be restored when you restore your instance, so this would need to be done manually.

+

Each line and entry needs to start with a slash or letter/digit. Only a-z, A-Z, ., 0-9, _, -, and / are allowed. If the entry begins with a letter/digit slashes are not supported. Two valid entries are /directory/on/the/host and my_custom_docker_volume. You need to make sure that all given directories exist or the backup container will fail to start!

+

Be sure to individually specify all storage that you want to back up as storage will not be mounted recursively. E.g. providing / as additional backup directory will only back up files and folders that are stored on the root partition and not on the EFI partition or any other. Excluded by the backup will be caches and a few other directories. If you want to back up the root partition you should make sure to stop all services before the backup so it can run correctly. For automating this see this documentation

+

Please note that the chosen directories/volumes will not be restored when you restore your instance, so this would need to be done manually.

{% if additional_backup_directories != "" %} - This option is currently set. You can disable it again by clearing the field and submitting your changes.

+

This option is currently set. You can disable it again by clearing the field and submitting your changes.

{% endif %} {% endif %} {% endif %} - {% if has_backup_run_once == false %} -
- {% else %} + {% if has_backup_run_once == true %}
{% endif %} {% endif %} @@ -531,79 +528,79 @@ {% endif %} {% if is_backup_container_running == false %} - {% if isApacheStarting == false %} + {% if isApacheStarting == false %}

AIO passphrase change

- Click here to change your AIO passphrase
- You can change your AIO passphrase below:

+ Click here to change your AIO passphrase +

You can change your AIO passphrase below:

- +
- The new passphrase needs to be at least 24 characters long. Allowed characters are the latin characters a-z, A-Z, 0-9 and spaces.
+

The new passphrase needs to be at least 24 characters long. Allowed characters are the latin characters a-z, A-Z, 0-9 and spaces.

{% endif %} {% endif %} {% endif %} {% if is_backup_container_running == false %}

Optional containers

- In this section you can enable or disable optional containers. There are further community containers available that are not listed below. See this documentation how to add them.

+

In this section you can enable or disable optional containers. There are further community containers available that are not listed below. See this documentation how to add them.

{% if isAnyRunning == true %} - Please note: You can enable or disable the options below only when your containers are stopped.

+

Please note: You can enable or disable the options below only when your containers are stopped.

{% else %} - Please note: Make sure to save your changes by clicking Save changes below the list of optional containers. The changes will not be auto-saved.

+

Please note: Make sure to save your changes by clicking Save changes below the list of optional containers. The changes will not be auto-saved.

{% endif %}
{% if is_clamav_enabled == true %} -

+

{% else %} -

+

{% endif %} {% if is_collabora_enabled == true %} -
+

{% else %} -
+

{% endif %} {% if is_fulltextsearch_enabled == true %} -
+

{% else %} -

+

{% endif %} {% if is_imaginary_enabled == true %} -

+

{% else %} -

+

{% endif %} {% if is_talk_enabled == true %} -

+

{% else %} -

+

{% endif %} {% if is_talk_recording_enabled == true %} -

+

{% else %} -

+

{% endif %} {% if is_onlyoffice_enabled == true %} -
+

{% else %} - {#
#} + {#

#} {% endif %} {% if is_docker_socket_proxy_enabled == true %} -

+

{% else %} -

+

{% endif %} - +
- Minimal system requirements: When any optional container is enabled, at least 2GB RAM, a dual-core CPU and 40GB system storage are required. When enabling ClamAV, Nextcloud Talk Recording-server or Fulltextsearch, at least 3GB RAM are required. For Talk Recording-server additional 2 vCPUs are required. When enabling everything, at least 5GB RAM and a quad-core CPU are required. Recommended are at least 1GB more RAM than the minimal requirement. For further advices and recommendations see this documentation
+

Minimal system requirements: When any optional container is enabled, at least 2GB RAM, a dual-core CPU and 40GB system storage are required. When enabling ClamAV, Nextcloud Talk Recording-server or Fulltextsearch, at least 3GB RAM are required. For Talk Recording-server additional 2 vCPUs are required. When enabling everything, at least 5GB RAM and a quad-core CPU are required. Recommended are at least 1GB more RAM than the minimal requirement. For further advices and recommendations see this documentation

{% if isAnyRunning == true or is_x64_platform == false %} {% endif %} @@ -621,21 +618,21 @@

Collabora dictionaries

{% if collabora_dictionaries == "" %} - In order to get the correct dictionaries in Collabora, you may configure the dictionaries below:

+

In order to get the correct dictionaries in Collabora, you may configure the dictionaries below:

- +
- You need to make sure that the dictionaries that you enter are valid. An example is de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru.

+

You need to make sure that the dictionaries that you enter are valid. An example is de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru.

{% else %} - The dictionaries for Collabora are currently set to {{ collabora_dictionaries }}. You can reset them again by clicking on the button below.

+

The dictionaries for Collabora are currently set to {{ collabora_dictionaries }}. You can reset them again by clicking on the button below.

- +
{% endif %} {% endif %} @@ -643,27 +640,27 @@

Timezone change

{% if isAnyRunning == true %} {% if timezone != "" %} - The timezone for Nextcloud is currently set to {{ timezone }}.

+

The timezone for Nextcloud is currently set to {{ timezone }}.

{% endif %} - Please note: You can change the timezone when your containers are stopped.

+

Please note: You can change the timezone when your containers are stopped.

{% else %} {% if timezone == "" %} - To get the correct time values for certain Nextcloud features, set the timezone for Nextcloud to the one that your users mainly use. Please note that this setting does not apply to the mastercontainer and any backup option.

- You can configure the timezone for Nextcloud below:

+

To get the correct time values for certain Nextcloud features, set the timezone for Nextcloud to the one that your users mainly use. Please note that this setting does not apply to the mastercontainer and any backup option.

+

You can configure the timezone for Nextcloud below:

- +
- You need to make sure that the timezone that you enter is valid. An example is Europe/Berlin. You can get valid values by looking at the 'TZ identifier' column of this list: click here. The default is Etc/UTC if nothing is entered.

+

You need to make sure that the timezone that you enter is valid. An example is Europe/Berlin. You can get valid values by looking at the 'TZ identifier' column of this list: click here. The default is Etc/UTC if nothing is entered.

{% else %} - The timezone for Nextcloud is currently set to {{ timezone }}. You can change the timezone by clicking on the button below.

+

The timezone for Nextcloud is currently set to {{ timezone }}. You can change the timezone by clicking on the button below.

- +
{% endif %} {% endif %} @@ -677,7 +674,7 @@ {% endif %} -
+
diff --git a/php/templates/includes/aio-config.twig b/php/templates/includes/aio-config.twig index e3c34d62c0e..718c1844487 100644 --- a/php/templates/includes/aio-config.twig +++ b/php/templates/includes/aio-config.twig @@ -1,36 +1,40 @@
- Click here to view the current AIO config and documentation links
+ Click here to view the current AIO config and documentation links {% if was_start_button_clicked == true %} - Nextclouds config.php file is stored in the nextcloud_aio_nextcloud Docker volume and can be edited by following the config.php documentation.

- You can run Nextcloud's usual occ commands by following the occ documentation.

+

Nextclouds config.php file is stored in the nextcloud_aio_nextcloud Docker volume and can be edited by following the config.php documentation.

+

You can run Nextcloud's usual occ commands by following the occ documentation.

{% endif %} - - {% if nextcloud_datadir starts with '/' %} - Nextcloud's datadir is getting stored in the {{ nextcloud_datadir }} directory. - {% else %} - Nextcloud's datadir is getting stored in the {{ nextcloud_datadir }} Docker volume. - {% endif %} - See the NEXTCLOUD_DATADIR documentation on how to change this.

- {% if nextcloud_mount == '' %} - The Nextcloud container is confied and local external storage in Nextcloud is disabled. - {% else %} - The Nextcloud container is getting gets access to the {{ nextcloud_mount }} directory and local external storage in Nextcloud is enabled. - {% endif %} - See the NEXTCLOUD_MOUNT documentation on how to change this.

+

+ {% if nextcloud_datadir starts with '/' %} + Nextcloud's datadir is getting stored in the {{ nextcloud_datadir }} directory. + {% else %} + Nextcloud's datadir is getting stored in the {{ nextcloud_datadir }} Docker volume. + {% endif %} + See the NEXTCLOUD_DATADIR documentation on how to change this. +

- Nextcloud has an upload limit of {{ nextcloud_upload_limit }} configured (for public link uploads. Bigger uploads are always possible when users are logged in). See the NEXTCLOUD_UPLOAD_LIMIT documentation on how to change this.

+

+ {% if nextcloud_mount == '' %} + The Nextcloud container is confied and local external storage in Nextcloud is disabled. + {% else %} + The Nextcloud container is getting gets access to the {{ nextcloud_mount }} directory and local external storage in Nextcloud is enabled. + {% endif %} + See the NEXTCLOUD_MOUNT documentation on how to change this.

- For Nextcloud, a memory limit of {{ nextcloud_memory_limit }} per PHP process is configured. See the NEXTCLOUD_MEMORY_LIMIT documentation on how to change this.

+

Nextcloud has an upload limit of {{ nextcloud_upload_limit }} configured (for public link uploads. Bigger uploads are always possible when users are logged in). See the NEXTCLOUD_UPLOAD_LIMIT documentation on how to change this.

- Nextcloud has a timeout of {{ nextcloud_max_time }} seconds configured (important for big file uploads). See the NEXTCLOUD_MAX_TIME documentation on how to change this.

+

For Nextcloud, a memory limit of {{ nextcloud_memory_limit }} per PHP process is configured. See the NEXTCLOUD_MEMORY_LIMIT documentation on how to change this.

- {% if is_dri_device_enabled == true %} - The /dev/dri device which is needed for hardware transcoding is getting attached to the Nextcloud container. - {% else %} - The /dev/dri device which is needed for hardware transcoding is not attached to the Nextcloud container. - {% endif %} - See the NEXTCLOUD_ENABLE_DRI_DEVICE documentation on how to change this.

+

Nextcloud has a timeout of {{ nextcloud_max_time }} seconds configured (important for big file uploads). See the NEXTCLOUD_MAX_TIME documentation on how to change this.

+ +

+ {% if is_dri_device_enabled == true %} + The /dev/dri device which is needed for hardware transcoding is getting attached to the Nextcloud container. + {% else %} + The /dev/dri device which is needed for hardware transcoding is not attached to the Nextcloud container. + {% endif %} + See the NEXTCLOUD_ENABLE_DRI_DEVICE documentation on how to change this.

- For further documentation on AIO, refer to this page. You can use the browser search [CTRL]+[F] to search through the documentation. Additional documentation can be found here.
+

For further documentation on AIO, refer to this page. You can use the browser search [CTRL]+[F] to search through the documentation. Additional documentation can be found here.

diff --git a/php/templates/includes/backup-dirs.twig b/php/templates/includes/backup-dirs.twig index bbc11eb870f..22090dee7c0 100644 --- a/php/templates/includes/backup-dirs.twig +++ b/php/templates/includes/backup-dirs.twig @@ -1,6 +1,6 @@ -The folder path that you enter must start with / and must not end with /.

-An example for Linux is /mnt/backup.

-On Synology it could be /volume1/docker/nextcloud/backup.

-For macOS it may be /var/backup.

-On Windows it might be /run/desktop/mnt/host/c/backup. (This path is equivalent to 'C:\backup' on your Windows host so you need to translate the path accordingly. Hint: the path that you enter needs to start with '/run/desktop/mnt/host/'. Append to that the exact location on your windows host, e.g. 'c/backup' which is equivalent to 'C:\backup'.) ⚠️ Please note: This does not work with external drives like USB or network drives and only with internal drives like SATA or NVME drives.

-Another option is to enter a specific volume name here: nextcloud_aio_backupdir. This volume needs to be created beforehand manually by you in order to be able to use it. See this documentation for an example.

+

The folder path that you enter must start with / and must not end with /.

+

An example for Linux is /mnt/backup.

+

On Synology it could be /volume1/docker/nextcloud/backup.

+

For macOS it may be /var/backup.

+

On Windows it might be /run/desktop/mnt/host/c/backup. (This path is equivalent to 'C:\backup' on your Windows host so you need to translate the path accordingly. Hint: the path that you enter needs to start with '/run/desktop/mnt/host/'. Append to that the exact location on your windows host, e.g. 'c/backup' which is equivalent to 'C:\backup'.) ⚠️ Please note: This does not work with external drives like USB or network drives and only with internal drives like SATA or NVME drives.

+

Another option is to enter a specific volume name here: nextcloud_aio_backupdir. This volume needs to be created beforehand manually by you in order to be able to use it. See this documentation for an example.

diff --git a/php/templates/login.twig b/php/templates/login.twig index 342878294f8..7240a7e2477 100644 --- a/php/templates/login.twig +++ b/php/templates/login.twig @@ -3,7 +3,7 @@ {% block body %}