feat: add frame ancestors variable
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Philipp Rothmann 2023-01-18 22:03:12 +01:00
parent 2c8c70fc36
commit 94a3270991
4 changed files with 4 additions and 2 deletions

View File

@ -4,3 +4,4 @@ LETS_ENCRYPT_ENV=production
NEXTCLOUD_DOMAIN=nextcloud.example.com NEXTCLOUD_DOMAIN=nextcloud.example.com
ADMIN_USERNAME=admin ADMIN_USERNAME=admin
SECRET_ADMIN_PASSWORD_VERSION=v1 SECRET_ADMIN_PASSWORD_VERSION=v1
FRAME_ANCESTORS=

View File

@ -1,2 +1,2 @@
export NGINX_CONF_VERSION=v2 export NGINX_CONF_VERSION=v2
export COOLWSD_XML_VERSION=v1 export COOLWSD_XML_VERSION=v2

View File

@ -39,6 +39,7 @@ services:
- DOMAIN=${DOMAIN} - DOMAIN=${DOMAIN}
- DONT_GEN_SSL_CERT=true - DONT_GEN_SSL_CERT=true
- NEXTCLOUD_DOMAIN=${NEXTCLOUD_DOMAIN} - NEXTCLOUD_DOMAIN=${NEXTCLOUD_DOMAIN}
- FRAME_ANCESTORS
networks: networks:
- internal - internal
deploy: deploy:

View File

@ -125,7 +125,7 @@
<host desc="The IPv4 private 10.0.0.0/8 subnet (Podman).">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host> <host desc="The IPv4 private 10.0.0.0/8 subnet (Podman).">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
<host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host> <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
</post_allow> </post_allow>
<frame_ancestors desc="Specify who is allowed to embed the LO Online iframe (coolwsd and WOPI host are always allowed). Separate multiple hosts by space."></frame_ancestors> <frame_ancestors desc="Specify who is allowed to embed the LO Online iframe (coolwsd and WOPI host are always allowed). Separate multiple hosts by space.">{{ env "FRAME_ANCESTORS" }}</frame_ancestors>
<connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by coolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs> <connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by coolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
<!-- this setting radically changes how online works, it should not be used in a production environment --> <!-- this setting radically changes how online works, it should not be used in a production environment -->