increase version

Signed-off-by: szaimen <szaimen@e.mail.de>

.github/dependabot.yml

@@ -1,9 +1,14 @@
 version: 2
 updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "weekly"
+  open-pull-requests-limit: 10
 - package-ecosystem: composer
   directory: "/php/"
   schedule:
-    interval: daily
+    interval: "daily"
     time: "12:00"
   open-pull-requests-limit: 10
   labels:

.github/workflows/dependency-updates.yml

@@ -9,7 +9,7 @@ jobs:
     name: Run dependency update script
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: nanasess/setup-php@master
       with:
         php-version: '8.0'
@@ -44,7 +44,7 @@ jobs:
         )"
         sed -i "s|pecl install APCu.*\;|pecl install APCu-$apcu_version\;|" ./Containers/mastercontainer/Dockerfile
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v3
+      uses: peter-evans/create-pull-request@v4
       with:
         commit-message: dependency updates
         signoff: true

.github/workflows/nextcloud-update.yml

@@ -10,7 +10,7 @@ jobs:
     name: Run nextcloud-update script
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Run nextcloud-update script
       run: |
         # Inspired by https://github.com/nextcloud/docker/blob/master/update.sh
@@ -64,7 +64,7 @@ jobs:
         sed -i "s|^ENV NEXTCLOUD_VERSION.*|ENV NEXTCLOUD_VERSION $NCVERSION|" ./Containers/nextcloud/Dockerfile
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v3
+      uses: peter-evans/create-pull-request@v4
       with:
         commit-message: nextcloud-update automated change
         signoff: true

.github/workflows/psalm-analysis.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Psalm
         uses: docker://ghcr.io/nextcloud/all-in-one-psalm
         with:

.github/workflows/psalm-security.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Psalm
         uses: docker://ghcr.io/nextcloud/all-in-one-psalm
         with:

.github/workflows/psalm-update-baseline.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up php8.0
         uses: shivammathur/setup-php@v2
@@ -31,7 +31,7 @@ jobs:
         continue-on-error: true
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           commit-message: Update psalm baseline

.github/workflows/shellcheck.yml

@@ -9,7 +9,7 @@ jobs:
     name: Github Actions
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Run Shellcheck
       uses: ludeeus/action-shellcheck@master
       with:

.github/workflows/spellcheck.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: spelling or typos
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: misspell
         uses: reviewdog/action-misspell@v1
         with:

Containers/apache/Dockerfile

@@ -1,7 +1,7 @@
 # Caddy is a requirement
 FROM caddy:2.4.6-alpine as caddy
 
-FROM debian:bullseye-20220316-slim
+FROM debian:bullseye-20220328-slim
 
 EXPOSE 80
 

Containers/borgbackup/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye-20220316-slim
+FROM debian:bullseye-20220328-slim
 
 RUN set -ex; \
     \
@@ -8,6 +8,7 @@ RUN set -ex; \
         rsync \
         fuse \
         python3-llfuse \
+        jq \
     ; \
     rm -rf /var/lib/apt/lists/*
 

Containers/borgbackup/backupscript.sh

@@ -174,24 +174,44 @@ if [ "$BORG_MODE" = restore ]; then
         exit 1
     fi
 
-    # Save current aio password
-    AIO_PASSWORD="$(grep -oP '"password":"[a-zA-Z0-9 ]+"' /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json)"
-    AIO_PASSWORD="${AIO_PASSWORD##\"password\":\"}"
-    AIO_PASSWORD="${AIO_PASSWORD%\"}"
-
-    # Save current path
-    BORG_LOCATION="$(grep -oP '"borg_backup_host_location":"[\\/a-zA-Z0-9 ]+"' /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json)"
-    BORG_LOCATION="${BORG_LOCATION##\"borg_backup_host_location\":\"}"
-    BORG_LOCATION="${BORG_LOCATION%\"}"
-
+    # Restore everything except the configuration file
     if ! rsync --stats --archive --human-readable -vv --delete \
     --exclude "nextcloud_aio_mastercontainer/session/"** \
     --exclude "nextcloud_aio_mastercontainer/certs/"** \
+    --exclude "nextcloud_aio_mastercontainer/data/configuration.json" \
     /tmp/borg/nextcloud_aio_volumes/ /nextcloud_aio_volumes; then
-        echo "Something failed while restoring the boot partition."
+        echo "Something failed while restoring from backup."
         umount /tmp/borg
         exit 1
     fi
+
+    # Save current aio password
+    AIO_PASSWORD="$(jq '.password' /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json)"
+
+    # Save current path
+    BORG_LOCATION="$(jq '.borg_backup_host_location' /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json)"
+
+    # Restore the configuration file
+    if ! rsync --archive --human-readable -vv \
+    /tmp/borg/nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json \
+    /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json; then
+        echo "Something failed while restoring the configuration.json."
+        umount /tmp/borg
+        exit 1
+    fi
+
+    # Set backup-mode to restore since it was a restore
+    CONTENTS="$(jq '."backup-mode" = "restore"' /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json)"
+    echo -E "${CONTENTS}" > /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json
+
+    # Reset the backup path to the currently used one
+    CONTENTS="$(jq ".borg_backup_host_location = $BORG_LOCATION" /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json)"
+    echo -E "${CONTENTS}" > /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json
+
+    # Reset the AIO password to the currently used one
+    CONTENTS="$(jq ".password = $AIO_PASSWORD" /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json)"
+    echo -E "${CONTENTS}" > /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json
+
     umount /tmp/borg
 
     # Inform user
@@ -201,27 +221,6 @@ if [ "$BORG_MODE" = restore ]; then
     # Add file to Nextcloud container so that it skips any update the next time
     touch "/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/skip.update"
     chmod 777 "/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/skip.update"
-
-    # Set backup-mode to restore since it was a restore
-    sed -i 's/"backup-mode":"[a-z]\+"/"backup-mode":"restore"/g' /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json
-
-    # Reset the AIO password to the currently used one
-    sed -i "s/\"password\":\"[a-zA-Z0-9 ]\+\"/\"password\":\"$AIO_PASSWORD\"/g" /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json
-
-    # Reset the backup path to the currently used one
-    if [ -n "$BORG_LOCATION" ]; then
-        # shellcheck disable=SC2143
-        if [ -n "$(grep -oP '"borg_backup_host_location":"[\\/a-zA-Z0-9 ]+"' /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json)" ]; then
-            sed -i "s/\"borg_backup_host_location\":\"[\\/a-zA-Z0-9 ]\+\"/\"borg_backup_host_location\":\"$BORG_LOCATION\"/g" /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json
-        else
-            echo "Could not set the borg_backup_host_location as it was empty."
-            echo "Probably the regex did not match."
-        fi
-    else
-        echo "Could not get the borg_backup_host_location as it was empty."
-        echo "Probably the regex did not match."
-    fi
-    exit 0
 fi
 
 # Do the Backup check

Containers/collabora/Dockerfile

@@ -1,2 +1,2 @@
 # From a file located probably somewhere here: https://github.com/CollaboraOnline/online/tree/master/docker
-FROM collabora/code:21.11.2.4.1
+FROM collabora/code:21.11.3.4.1

Containers/domaincheck/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.15.1
+FROM alpine:3.15.3
 RUN apk add --update --no-cache lighttpd bash
 
 RUN adduser -S www-data -G www-data

Containers/mastercontainer/Dockerfile

@@ -1,5 +1,5 @@
 # Docker CLI is a requirement
-FROM docker:20.10.13-dind-alpine3.15 as dind
+FROM docker:20.10.14-dind-alpine3.15 as dind
 
 # Caddy is a requirement
 FROM caddy:2.4.6-alpine as caddy

Containers/nextcloud/entrypoint.sh

@@ -286,11 +286,13 @@ if [ "$COLLABORA_ENABLED" = 'yes' ]; then
         php /var/www/html/occ app:update richdocuments
     fi
     php /var/www/html/occ config:app:set richdocuments wopi_url --value="https://$NC_DOMAIN/"
+    php /var/www/html/occ config:app:set richdocuments public_wopi_url --value="https://$NC_DOMAIN/"
     # php /var/www/html/occ richdocuments:activate-config
     # Fix https://github.com/nextcloud/all-in-one/issues/188:
     php /var/www/html/occ config:system:set allow_local_remote_servers --type=bool --value=true
 else
     if [ -d "/var/www/html/custom_apps/richdocuments" ]; then
+        php /var/www/html/occ config:system:delete allow_local_remote_servers
         php /var/www/html/occ app:remove richdocuments
     fi
 fi

Containers/watchtower/Dockerfile

@@ -1,7 +1,7 @@
 # From https://github.com/containrrr/watchtower/blob/main/dockerfiles/Dockerfile.self-contained
 FROM containrrr/watchtower:1.4.0 as watchtower
 
-FROM alpine:3.15.1
+FROM alpine:3.15.3
 
 RUN apk add --update --no-cache bash
 COPY --from=watchtower /watchtower /

php/composer.lock

@@ -1372,25 +1372,25 @@
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.5.0",
+            "version": "v3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
+                "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/c726b64c1ccfe2896cb7df2e1331c357ad1c8ced",
+                "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=8.0.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.0-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -1419,7 +1419,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.0"
             },
             "funding": [
                 {
@@ -1435,7 +1435,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-12T14:48:14+00:00"
+            "time": "2021-11-01T23:48:49+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -1683,16 +1683,16 @@
         },
         {
             "name": "twig/twig",
-            "version": "v3.3.8",
+            "version": "v3.3.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "972d8604a92b7054828b539f2febb0211dd5945c"
+                "reference": "6ff9b0e440fa66f97f207e181c41340ddfa5683d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/972d8604a92b7054828b539f2febb0211dd5945c",
-                "reference": "972d8604a92b7054828b539f2febb0211dd5945c",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/6ff9b0e440fa66f97f207e181c41340ddfa5683d",
+                "reference": "6ff9b0e440fa66f97f207e181c41340ddfa5683d",
                 "shasum": ""
             },
             "require": {
@@ -1743,7 +1743,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.3.8"
+                "source": "https://github.com/twigphp/Twig/tree/v3.3.9"
             },
             "funding": [
                 {
@@ -1755,7 +1755,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-04T06:59:48+00:00"
+            "time": "2022-03-25T09:37:52+00:00"
         }
     ],
     "packages-dev": [],
@@ -1772,5 +1772,5 @@
         "ext-apcu": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }

php/public/automatic_reload.js

@@ -10,4 +10,8 @@ if (document.hasFocus()) {
     setTimeout(function(){
     window.location.reload(1);
     }, 5000);
+} else {
+    window.addEventListener("beforeunload", function() {
+        document.getElementById('overlay').classList.add('loading')
+    });
 }

php/public/before-unload.js

@@ -0,0 +1,3 @@
+window.addEventListener("beforeunload", function() {
+    document.getElementById('overlay').classList.add('loading')
+});

php/public/index.php

@@ -74,13 +74,14 @@ $app->get('/containers', function ($request, $response, $args) use ($container)
     return $view->render($response, 'containers.twig', [
         'domain' => $configurationManager->GetDomain(),
         'borg_backup_host_location' => $configurationManager->GetBorgBackupHostLocation(),
-        'borg_backup_mode' => $configurationManager->GetBorgBackupMode(),
         'nextcloud_password' => $configurationManager->GetSecret('NEXTCLOUD_PASSWORD'),
         'containers' => (new \AIO\ContainerDefinitionFetcher($container->get(\AIO\Data\ConfigurationManager::class), $container))->FetchDefinition(),
         'borgbackup_password' => $configurationManager->GetSecret('BORGBACKUP_PASSWORD'),
         'is_mastercontainer_update_available' => $dockerActionManger->IsMastercontainerUpdateAvailable(),
         'has_backup_run_once' => $configurationManager->hasBackupRunOnce(),
+        'is_backup_container_running' => $dockerActionManger->isBackupContainerRunning(),
         'backup_exit_code' => $dockerActionManger->GetBackupcontainerExitCode(),
+        'borg_backup_mode' => $configurationManager->GetBorgBackupMode(),
         'was_start_button_clicked' => $configurationManager->wasStartButtonClicked(),
         'has_update_available' => $dockerActionManger->isAnyUpdateAvailable(),
         'last_backup_time' => $configurationManager->GetLastBackupTime(),

php/src/Docker/DockerActionManager.php

@@ -600,4 +600,13 @@ class DockerActionManager
         }
         return true;
     }
+
+    public function isBackupContainerRunning() : bool {
+        $id = 'nextcloud-aio-borgbackup';
+        $backupContainer = $this->containerDefinitionFetcher->GetContainerById($id);
+        if ($this->GetContainerRunningState($backupContainer) instanceof RunningState) {
+            return true;
+        }
+        return false;
+    }
 }

php/templates/containers.twig

@@ -16,17 +16,25 @@
     </header>
 
     <div class="content">
-        <h1>Nextcloud AIO Beta v0.9.0</h1>
+        <h1>Nextcloud AIO Beta v0.9.1</h1>
         This is beta software and not production ready.<br><br>
 
         {% set isAnyRunning = false %}
         {% set isAnyRestarting = false %}
         {% set isWatchtowerRunning = false %}
-        {% set isBackupContainerRunning = false %}
         {% set isRestoreRunning = false %}
         {% set isBackupOrRestoreRunning = false %}
         {% set isApacheStarting = false %}
 
+        {% if is_backup_container_running == true %}
+            {% if borg_backup_mode == 'restore' %}
+                {% set isRestoreRunning = true %}
+            {% endif %}
+            {% if borg_backup_mode == 'backup' or borg_backup_mode == 'restore' %}
+                {% set isBackupOrRestoreRunning = true %}
+            {% endif %}
+        {% endif %}
+
         {% for container in containers %}
             {% if container.GetIdentifier() not in ['nextcloud-aio-domaincheck', 'nextcloud-aio-borgbackup', 'nextcloud-aio-watchtower'] and class(container.GetRunningState()) == 'AIO\\Container\\State\\RunningState' %}
                 {% set isAnyRunning = true %}
@@ -40,23 +48,13 @@
             {% if container.GetIdentifier() == 'nextcloud-aio-apache' and class(container.GetStartingState()) == 'AIO\\Container\\State\\StartingState' %}
                 {% set isApacheStarting = true %}
             {% endif %}
-            {% if container.GetIdentifier() == 'nextcloud-aio-borgbackup' and class(container.GetRunningState()) == 'AIO\\Container\\State\\RunningState' %}
-                {% set isBackupContainerRunning = true %}
-                {% if borg_backup_mode == 'restore' %}
-                    {% set isRestoreRunning = true %}
-                {% endif %}
-                {% if borg_backup_mode == 'backup' or borg_backup_mode == 'restore' %}
-                    {% set isBackupOrRestoreRunning = true %}
-                {% endif %}
-            {% endif %}
         {% endfor %}
 
         {% if isWatchtowerRunning == true %}
-            Mastercontainer update currently running. It will restart the mastercontainer soon which will make it unavailable for a moment. Please wait until that's done.<br /><br />
+            <span class="status running"></span> Mastercontainer update currently running. It will restart the mastercontainer soon which will make it unavailable for a moment. Please wait until that's done. (<a href="/api/docker/logs?id=nextcloud-aio-mastercontainer">Logs</a>)<br /><br />
             <a href="" class="button reload">Reload ↻</a><br/>
         {% else %}
-            You are currently running the {{ current_channel }} channel. (<a href="/api/docker/logs?id=nextcloud-aio-mastercontainer">Logs</a>)<br><br>
-            {% if isBackupContainerRunning == false and domain == "" %}
+            {% if is_backup_container_running == false and domain == "" %}
                 {% if is_mastercontainer_update_available == true %}
                     <h2>Mastercontainer update</h2>
                     ⚠ A mastercontainer update is available. Please click on the button below to update it. Afterwards, you will be able to proceed with the setup.<br><br>
@@ -66,8 +64,8 @@
                         <input class="button" type="submit" value="Update mastercontainer" />
                     </form>
                 {% else %}
-                    Nextcloud AIO stands for Nextcloud All In One and provides easy deployment and maintenance with most features included in this one Nextcloud instance.<br><br>
                     {% if borg_backup_host_location == '' and borg_restore_password == '' %}
+                        Nextcloud AIO stands for Nextcloud All In One and provides easy deployment and maintenance with most features included in this one Nextcloud instance.<br><br>
                         <h2>New AIO instance</h2>
                         Please type in the domain that will be used for Nextcloud if you want to create a new instance:<br><br />
                         <form method="POST" action="/api/configuration" class="xhr">
@@ -146,12 +144,13 @@
                     {% endif %}
                 {% endif %}
             {% endif %}
-            {% if isBackupContainerRunning == true and domain == "" %}
-                Backup container is currently running.<br /><br />
+            {% if is_backup_container_running == true %}
+                <span class="status running"></span> Backup container is currently running. (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br />
                 <a href="" class="button reload">Reload ↻</a><br/><br>
             {% endif %}
 
             {% if domain != "" %}
+                You are currently running the {{ current_channel }} channel. (<a href="/api/docker/logs?id=nextcloud-aio-mastercontainer">Logs</a>)<br><br>
 
                 {% if isAnyRunning == true %}
                     {% if isApacheStarting != true %}
@@ -163,7 +162,7 @@
                         <a href="https://{{ domain }}" class="button" target="_blank" rel="noopener">Open your Nextcloud ↗</a><br/>
                     {% else %}
                         {% if isAnyRestarting == false %}
-                            Containers are currently starting.<br /><br />
+                            <span class="status running"></span> Containers are currently starting.<br /><br />
                             <a href="" class="button reload">Reload ↻</a><br/><br>
                         {% else %}
                             It seems like at least one container is currently restarting which means it is not able to start correctly.<br><br>
@@ -264,7 +263,7 @@
 
                 {% if was_start_button_clicked == true %}
 
-                    {% if isBackupContainerRunning == false and borg_backup_host_location == "" and isApacheStarting != true %}
+                    {% if is_backup_container_running == false and borg_backup_host_location == "" and isApacheStarting != true %}
                         <h2>Backup and restore</h2>
                         Please type in the directory where backups will get created on the host system:<br><br>
                         <form method="POST" action="/api/configuration" class="xhr">
@@ -277,8 +276,8 @@
                     {% endif %}
 
                     {% if borg_backup_host_location != "" %}
-                        <h2>Backup and restore</h2>
-                        {% if isBackupContainerRunning == false %}
+                        {% if is_backup_container_running == false %}
+                            <h2>Backup and restore</h2>
                             {% if backup_exit_code > 0 %}
                                 <span class="status error"></span> Last {{ borg_backup_mode }} failed! (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br />
                             {% elseif backup_exit_code == 0 %}
@@ -290,7 +289,7 @@
                             {% endif %}
                         {% endif %}
 
-                        {% if isBackupContainerRunning == false %}
+                        {% if is_backup_container_running == false %}
                             {% if has_backup_run_once == true %}
                                 <details>
                                 <summary>Click here to reveal all backup options</summary><br />
@@ -340,14 +339,10 @@
                             {% else %}
                                 </details><br /><br />
                             {% endif %}
-
-                        {% else %}
-                            <span class="status running"></span> Backup container currently running. (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br />
-                            <a href="" class="button reload">Reload ↻</a><br/>
                         {% endif %}
                     {% endif %}
 
-                    {% if isBackupContainerRunning == false %}
+                    {% if is_backup_container_running == false %}
                         {% if isApacheStarting == false %} 
                             <h2>AIO password change</h2>
                             You can change your AIO password below:<br><br />
@@ -362,7 +357,7 @@
                         {% endif %}
                     {% endif %}
                 {% endif %}
-                {% if isBackupContainerRunning == false %}
+                {% if is_backup_container_running == false %}
                     <h2>Optional addons</h2>
                     In this section, you can find optional addons.<br>
                     You can enable or disaable them when your containers are stopped.<br><br>
@@ -404,8 +399,10 @@
             {% endif %}
         {% endif %}
 
-    {% if isApacheStarting == true or isBackupContainerRunning == true or isWatchtowerRunning == true %}
+    {% if isApacheStarting == true or is_backup_container_running == true or isWatchtowerRunning == true %}
         <script type="text/javascript" src="automatic_reload.js"></script>
+    {% else %}
+        <script type="text/javascript" src="before-unload.js"></script>
     {% endif %}
 
     </div>

readme.md

@@ -21,7 +21,8 @@ The following instructions are especially meant for Linux. For macOS see [this](
     curl -fsSL get.docker.com | sudo sh
     ```
 
-2. Run the following command in order to start the container:
+2. Run the following command in order to start the container:<br>
+    (For people that cannot use ports 80 and/or 443 on this server, please follow [this documentation](https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md). Otherwise please run the command below!)
     ```
     # For x64 CPUs:
     sudo docker run -it \
@@ -122,6 +123,19 @@ It is recommended to create a backup before any container update. By doing this,
 
 If you connect an external drive to your host, and choose the backup directory to be on that drive, you are also kind of save against drive failures of the drive where the docker volumes are stored on. 
 
+<details>
+<summary>How to do the above step for step</summary>
+
+<br>
+
+1. Mount an external/backup HDD to the host OS using the built-in functionality or udev rules or whatever way you prefer. (E.g. follow this video: https://www.youtube.com/watch?v=2lSyX4D3v_s) and mount the drive in best case in `/mnt/backup`.
+2. If not already done, fire up the docker container and set up Nextcloud as per the guide.
+3. Now open the AIO interface.
+4. Under backup section, add your external disk mountpoint as backup directory, e.g. `/mnt/backup`.
+5. Click on `Create Backup` which should create the first backup on the external disk.
+
+</details>
+
 Backups can be created and restored in the AIO interface using the buttons `Create Backup` and `Restore selected backup`. Additionally, a backup check is provided that checks the integrity of your backups but it shouldn't be needed in most situations. 
 
 The backups itself get encrypted with an encryption key that gets shown to you in the AIO interface. Please save that at a safe place as you will not be able to restore from backup without this key.
@@ -209,6 +223,11 @@ if ! [ -d "$SOURCE_DIRECTORY" ]; then
     exit 1
 fi
 
+if [ -z "$(ls -A "$SOURCE_DIRECTORY/")" ]; then
+    echo "The source directory is empty which is not allowed."
+    exit 1
+fi
+
 if ! [ -d "$DRIVE_MOUNTPOINT" ]; then
     echo "The drive mountpoint must be an existing directory"
     exit 1
@@ -244,13 +263,13 @@ if ! rsync --stats --archive --human-readable --delete "$SOURCE_DIRECTORY/" "$TA
 fi
 
 umount "$DRIVE_MOUNTPOINT"
-if mountpoint -q "$DRIVE_MOUNTPOINT"; then
-    echo "Synced the backup repository successfully but failed to unmount the target drive."
-    exit 0
+
+if docker ps --format "{{.Names}}" | grep "^nextcloud-aio-nextcloud$"; then
+    docker exec -it nextcloud-aio-nextcloud bash /notify.sh "Rsync backup successful!" "Synced the backup repository successfully."
+else
+    echo "Synced the backup repository successfully."
 fi
 
-echo "Synced the backup repository successfully and unmounted the target drive."
-exit 0
 ```
 
 </details>

reverse-proxy.md

@@ -1,11 +1,17 @@
-## Reverse Proxy Config
+## Reverse Proxy Documentation
 
 Basically, you need to specify the port that the apache container shall use and modify the startup command a bit.
 
 All examples below will use port `11000` as example apache port. Also it is supposed that the reverse proxy runs on the same server like AIO, hence `localhost` is used and not an internal ip-address to point to the AIO instance. Modify both to your needings.
 
-### Caddy reverse proxy config example
+### Reverse proxy config examples
 
+#### Caddy
+
+<details>
+
+<summary>click here to expand</summary>
+<br>
 Add this to your Caddyfile:
 
 ```
@@ -17,8 +23,38 @@ https://<your-nc-domain>:443 {
 
 Of course you need to modify `<your-nc-domain>` to the domain on which you want to run Nextcloud.
 
+</details>
+
+#### Nginx
+
+<details>
+
+<summary>click here to expand</summary>
+<br>
+Add this to you nginx config:
+
+```
+location / {
+        proxy_pass http://localhost:11000;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+        # Websocket
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+    }
+```
+
+Of course SSL needs to be set up as well e.g. by using certbot and your domain must be also added inside the nginx config.
+
+</details>
+
 ### Startup command
 
+After adjusting your reverse proxy config, use the following command to start AIO:
+
 ```
 # For x64 CPUs:
 sudo docker run -it \