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

Merge pull request #464 from nextcloud/fix/noid/small-fixes

Browse source 
a few small improvements
This commit is contained in:
Simon L 2022-04-06 21:03:18 +02:00 • committed by GitHub
commit e8d66a06d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Containers/mastercontainer/backup-time-file-watcher.sh
View file

@ -1,9 +1,8 @@
#!/bin/bash #!/bin/bash
restart_process() { restart_process() {
set -x echo "Restarting cron.sh because daily backup time was set or unset."
pkill cron.sh pkill cron.sh
set +x
} }
file_present() { file_present() {
@ -22,5 +21,5 @@ file_present() {
while true; do while true; do
file_present file_present
sleep 5 sleep 2
done done

2
Containers/mastercontainer/session-deduplicator.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
while true; do while true; do
while "$(find "/mnt/docker-aio-config/session/" -mindepth 1 -exec grep "aio_authenticated|[a-z]:1" {} \; | wc -l)" -gt 1; do while [ "$(find "/mnt/docker-aio-config/session/" -mindepth 1 -exec grep "aio_authenticated|[a-z]:1" {} \; | wc -l)" -gt 1 ]; do
unset SESSION_FILES unset SESSION_FILES
SESSION_FILES="$(find "/mnt/docker-aio-config/session/" -mindepth 1)" SESSION_FILES="$(find "/mnt/docker-aio-config/session/" -mindepth 1)"
unset SESSION_FILES_ARRAY unset SESSION_FILES_ARRAY

6
php/templates/containers.twig
View file

@ -118,7 +118,7 @@
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}"> <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
<select id="selected_restore_time" name="selected_restore_time" form="restore_selection"> <select id="selected_restore_time" name="selected_restore_time" form="restore_selection">
{% for restore_time in backup_times %} {% for restore_time in backup_times %}
<option value="{{ restore_time }}">{{ restore_time }}</option> <option value="{{ restore_time }}">{{ restore_time }} CT</option>
{% endfor %} {% endfor %}
</select> </select>
<input class="button" type="submit" value="Restore selected backup"/> <input class="button" type="submit" value="Restore selected backup"/>
@ -297,7 +297,7 @@
<span class="status error"></span> Last {{ borg_backup_mode }} failed! (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br /> <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 %} {% elseif backup_exit_code == 0 %}
{% if borg_backup_mode == "backup" %} {% if borg_backup_mode == "backup" %}
<span class="status success"></span> Last {{ borg_backup_mode }} successful on {{ last_backup_time }}! (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br /> <span class="status success"></span> Last {{ borg_backup_mode }} successful on {{ last_backup_time }} CT! (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br />
{% else %} {% else %}
<span class="status success"></span> Last {{ borg_backup_mode }} successful! (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br /> <span class="status success"></span> Last {{ borg_backup_mode }} successful! (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br />
{% endif %} {% endif %}
@ -342,7 +342,7 @@
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}"> <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
<select id="selected_restore_time" name="selected_restore_time" form="restore_selection"> <select id="selected_restore_time" name="selected_restore_time" form="restore_selection">
{% for restore_time in backup_times %} {% for restore_time in backup_times %}
<option value="{{ restore_time }}">{{ restore_time }}</option> <option value="{{ restore_time }}">{{ restore_time }} CT</option>
{% endfor %} {% endfor %}
</select> </select>
<input class="button" type="submit" value="Restore selected backup" onclick="return confirm('Restore the selected backup? Are you sure that you want to restore the selected backup? This will stop all running containers and restore the selected backup. It is recommended to create a backup first. You might also want to check the backup integrity.')" /> <input class="button" type="submit" value="Restore selected backup" onclick="return confirm('Restore the selected backup? Are you sure that you want to restore the selected backup? This will stop all running containers and restore the selected backup. It is recommended to create a backup first. You might also want to check the backup integrity.')" />