diff --git a/profiles/templates/homeassistant/homeassistant/ini.env b/profiles/templates/homeassistant/homeassistant/ini.env index 7284716..012cc1c 100644 --- a/profiles/templates/homeassistant/homeassistant/ini.env +++ b/profiles/templates/homeassistant/homeassistant/ini.env @@ -1,4 +1,4 @@ -# Calculate format=samba path=/var/calculate grep(/var/calculate/ini.env,[homeassistant])== protected +# Calculate format=samba path=/var/calculate grep(/var/calculate/ini.env,\[homeassistant\])== protected [homeassistant] protocol = http domain = #-ip()-# diff --git a/profiles/templates/homeassistant/nginx/ssl/create-ssl b/profiles/templates/homeassistant/nginx/ssl/create-ssl index 4f3c161..586f16b 100644 --- a/profiles/templates/homeassistant/nginx/ssl/create-ssl +++ b/profiles/templates/homeassistant/nginx/ssl/create-ssl @@ -1,5 +1,7 @@ # Calculate run=/bin/bash +[[ -n "$(ls -A /var/calculate/ssl)" ]] && exit + cd /var/calculate/ssl openssl req -new -x509 -nodes -subj "/CN=calculate.root" -newkey rsa:2048 -keyout ca.key -out ca.crt -reqexts v3_req -extensions v3_ca openssl req -new -nodes -sha256 -newkey rsa:2048 -config /var/db/repos/container/profiles/ini.env -out domain.csr -keyout privkey.pem diff --git a/profiles/templates/homeassistant/postgresql/ini.env b/profiles/templates/homeassistant/postgresql/ini.env index 8b1ec8a..417419a 100644 --- a/profiles/templates/homeassistant/postgresql/ini.env +++ b/profiles/templates/homeassistant/postgresql/ini.env @@ -1,4 +1,4 @@ -# Calculate format=samba path=/var/calculate grep(/var/calculate/ini.env,postgresql)== protected +# Calculate format=samba path=/var/calculate grep(/var/calculate/ini.env,\[postgresql\])== protected [postgresql] postgres_password = #-rnd(pas,12)-# homeassistant_password = #-rnd(pas,12)-# diff --git a/profiles/templates/homeassistant/zigbee2mqtt/ini.env b/profiles/templates/homeassistant/zigbee2mqtt/ini.env index 1d93766..f64aaf1 100644 --- a/profiles/templates/homeassistant/zigbee2mqtt/ini.env +++ b/profiles/templates/homeassistant/zigbee2mqtt/ini.env @@ -1,4 +1,4 @@ -# Calculate format=samba path=/var/calculate grep(/var/calculate/ini.env,[zigbee2mqtt])== protected +# Calculate format=samba path=/var/calculate grep(/var/calculate/ini.env,\[zigbee2mqtt\])== protected [zigbee2mqtt] #?exists(/dev/ttyUSB0)!=# dev = /dev/ttyUSB0 diff --git a/profiles/templates/mastodon/mastodon/ini.env b/profiles/templates/mastodon/mastodon/ini.env index d484c33..aa055fb 100644 --- a/profiles/templates/mastodon/mastodon/ini.env +++ b/profiles/templates/mastodon/mastodon/ini.env @@ -1,4 +1,4 @@ -# Calculate format=samba path=/var/calculate chmod=600 chown=mastodon:mastodon grep(/var/calculate/ini.env,[mastodon])== protected +# Calculate format=samba path=/var/calculate chmod=600 chown=mastodon:mastodon grep(/var/calculate/ini.env,\[mastodon\])== protected [mastodon] local_domain=calculate.social diff --git a/profiles/templates/mastodon/postgresql/ini.env b/profiles/templates/mastodon/postgresql/ini.env index 99eda48..640c544 100644 --- a/profiles/templates/mastodon/postgresql/ini.env +++ b/profiles/templates/mastodon/postgresql/ini.env @@ -1,4 +1,4 @@ -# Calculate format=samba chown=mastodon:mastodon path=/var/calculate grep(/var/calculate/ini.env,[postgresql])== comment=# protected +# Calculate format=samba chown=mastodon:mastodon path=/var/calculate grep(/var/calculate/ini.env,\[postgresql\])== comment=# protected [postgresql] postgres_password = #-rnd(pas,12)-# mastodon_user = mastodon diff --git a/profiles/templates/taiga/postgresql/ini.env b/profiles/templates/taiga/postgresql/ini.env index eee6eab..1a60a40 100644 --- a/profiles/templates/taiga/postgresql/ini.env +++ b/profiles/templates/taiga/postgresql/ini.env @@ -1,4 +1,4 @@ -# Calculate format=samba path=/var/calculate grep(/var/calculate/ini.env,[postgresql])== protected +# Calculate format=samba path=/var/calculate grep(/var/calculate/ini.env,\[postgresql\])== protected [postgresql] postgres_password = #-rnd(pas,12)-# taiga_password = #-rnd(pas,12)-# diff --git a/profiles/templates/taiga/rabbitmq-server/ini.env b/profiles/templates/taiga/rabbitmq-server/ini.env index 30a8882..9eaed84 100644 --- a/profiles/templates/taiga/rabbitmq-server/ini.env +++ b/profiles/templates/taiga/rabbitmq-server/ini.env @@ -1,3 +1,3 @@ -# Calculate format=samba path=/var/calculate grep(/var/calculate/ini.env,[rabbitmq])== protected +# Calculate format=samba path=/var/calculate grep(/var/calculate/ini.env,\[rabbitmq\])== protected [rabbitmq] taiga_password = #-rnd(pas,12)-# diff --git a/profiles/templates/taiga/taiga/ini.env b/profiles/templates/taiga/taiga/ini.env index 4af5976..f77a205 100644 --- a/profiles/templates/taiga/taiga/ini.env +++ b/profiles/templates/taiga/taiga/ini.env @@ -1,4 +1,4 @@ -# Calculate format=samba path=/var/calculate chmod=600 chown=taiga:taiga grep(/var/calculate/ini.env,[taiga])== protected +# Calculate format=samba path=/var/calculate chmod=600 chown=taiga:taiga grep(/var/calculate/ini.env,\[taiga\])== protected [taiga] protocol = http taiga_sites_domain = #-ip()-#