Nextcloud AIO v{{ aio_version }}
+Nextcloud AIO v12.4.0
{# Add 2nd tab warning #} @@ -27,7 +26,7 @@ {# js for optional containers and additional containers forms #} - + {% set hasBackupLocation = borg_backup_host_location or borg_remote_repo %} {% set isAnyRunning = false %} @@ -46,19 +45,19 @@ {% endif %} {% for container in containers %} - {% if container.displayName != '' and container.GetRunningState().value == 'running' %} + {% if container.GetDisplayName() != '' and container.GetRunningState().value == 'running' %} {% set isAnyRunning = true %} {% endif %} - {% if container.displayName != '' and container.GetRestartingState().value == 'restarting' %} + {% if container.GetDisplayName() != '' and container.GetRestartingState().value == 'restarting' %} {% set isAnyRestarting = true %} {% endif %} - {% if container.identifier == 'nextcloud-aio-watchtower' and container.GetRunningState().value == 'running' %} + {% if container.GetIdentifier() == 'nextcloud-aio-watchtower' and container.GetRunningState().value == 'running' %} {% set isWatchtowerRunning = true %} {% endif %} - {% if container.identifier == 'nextcloud-aio-domaincheck' and container.GetRunningState().value == 'running' %} + {% if container.GetIdentifier() == 'nextcloud-aio-domaincheck' and container.GetRunningState().value == 'running' %} {% set isDomaincheckRunning = true %} {% endif %} - {% if container.identifier == 'nextcloud-aio-apache' and container.GetStartingState().value == 'starting' %} + {% if container.GetIdentifier() == 'nextcloud-aio-apache' and container.GetStartingState().value == 'starting' %} {% set isApacheStarting = true %} {% endif %} {% endfor %} @@ -281,7 +280,7 @@-
{# @var containers \AIO\Container\Container[] #}
{% for container in containers %}
- {% if container.displayName != '' %}
+ {% if container.GetDisplayName() != '' %}
{% include 'components/container-state.twig' with {'c': container} only %}
{% endif %}
{% endfor %}
diff --git a/php/templates/includes/aio-version.twig b/php/templates/includes/aio-version.twig
deleted file mode 100644
index 1b62f917..00000000
--- a/php/templates/includes/aio-version.twig
+++ /dev/null
@@ -1 +0,0 @@
-12.6.1
diff --git a/php/templates/includes/optional-containers.twig b/php/templates/includes/optional-containers.twig
index eabcb139..b4764592 100644
--- a/php/templates/includes/optional-containers.twig
+++ b/php/templates/includes/optional-containers.twig
@@ -9,105 +9,6 @@
-
Office Suite
- {% if isAnyRunning == false %} -Choose your preferred office suite. Only one can be enabled at a time.
- {% endif %} -
-
-
-
-
-
-
-
- {% if isAnyRunning == false %}
-
-
-
-
- {% endif %}
-
- Additional Optional Containers
+
+ + +
- +
+ + +
- +
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 advice and recommendations see this documentation
{% if isAnyRunning == true %} - - + + @@ -228,46 +156,46 @@ {% endif %} {% if is_collabora_enabled == true and isAnyRunning == false and was_start_button_clicked == true %} -Nextcloud Office dictionaries
+Collabora dictionaries
{% if collabora_dictionaries == "" %} -In order to get the correct dictionaries in Nextcloud Office, 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.
{% else %} -The dictionaries for Nextcloud Office 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 %} -Additional Nextcloud Office options
+Additional Collabora options
{% if collabora_additional_options == "" %} -You can configure additional options for Nextcloud Office below.
+You can configure additional options for collabora below.
(This can be used for configuring the net.content_security_policy and more. Make sure to submit the value!)
You need to make sure that the options that you enter are valid. An example is --o:net.content_security_policy=frame-ancestors *.example.com:*;.
{% else %} -The additioinal options for Nextcloud Office are currently set to {{ collabora_additional_options }}. You can reset them again by clicking on the button below.
+The additioinal options for Collabora are currently set to {{ collabora_additional_options }}. You can reset them again by clicking on the button below.
{% endif %} {% endif %} diff --git a/php/templates/layout.twig b/php/templates/layout.twig index 79c615d9..4d842e3d 100644 --- a/php/templates/layout.twig +++ b/php/templates/layout.twig @@ -1,7 +1,7 @@⚠️ **Please note:** look into [this](#adapting-the-sample-web-server-configurations-below) to adapt the above example configuration. diff --git a/zizmor.yml b/zizmor.yml index 7601baa4..a991eaa5 100644 --- a/zizmor.yml +++ b/zizmor.yml @@ -4,5 +4,7 @@ rules: dangerous-triggers: ignore: - build_images.yml - artipacked: - disable: true + unpinned-uses: + config: + policies: + actions/*: ref-pin