Merge remote-tracking branch 'refs/remotes/origin/master'

ci/homeassistant.jenkinsfile

@@ -2,11 +2,8 @@
 @Library('cfgpol')_
 
 applyConfigPolicy(
-    'home-assistant:hassdb',
+    null,
     [
-        'Home Assistant DB': [
-            'hassdb.yml'
-        ],
         'Home Assistant': [
             'homeassistant.yml'
         ]

roles/websites/proxy-nextcloud/templates/nextcloud.httpd.conf.j2

@@ -8,6 +8,7 @@ SSLCertificateKeyFile /etc/pki/tls/private/pyrocufflink.net.key
 
 SSLProxyEngine On
 ProxyRequests Off
+ProxyPreserveHost On
 ProxyPass / https://cloud0.pyrocufflink.blue/
 ProxyPassReverse / https://cloud0.pyrocufflink.blue/
 </VirtualHost>

vars/applyConfigPolicy.groovy

@@ -1,4 +1,5 @@
 import groovy.transform.Field
+import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 
 @Field
 def DOCKER_ARGS = '''\
@@ -52,15 +53,20 @@ def stageKinit() {
 
 
 def stageRemountRW(limit) {
-    stage('Remount R/W') {
+    def STAGE_NAME = 'Remount R/W'
-        ansiblePlaybook \
+    stage(STAGE_NAME) {
-            playbook: 'remount.yml',
+        if (limit) {
-            limit: limit,
+            ansiblePlaybook \
-            become: true,
+                playbook: 'remount.yml',
-            vaultCredentialsId: 'ansible-vault',
+                limit: limit,
-            extraVars: [
+                become: true,
-                remount_state: 'rw',
+                vaultCredentialsId: 'ansible-vault',
-            ]
+                extraVars: [
+                    remount_state: 'rw',
+                ]
+        } else {
+            Utils.markStageSkippedForConditional(STAGE_NAME)
+        }
     }
 }
 
@@ -80,13 +86,18 @@ def generateStages(stages) {
 }
 
 def stageRemountRO(limit) {
-    stage('Remount R/O') {
+    def STAGE_NAME = 'Remount R/W'
-        ansiblePlaybook \
+    stage(STAGE_NAME) {
-            playbook: 'remount.yml',
+        if (limit) {
-            limit: limit + ':!rw-root',
+            ansiblePlaybook \
-            become: true,
+                playbook: 'remount.yml',
-            vaultCredentialsId: 'ansible-vault',
+                limit: limit + ':!rw-root',
-            extras: '--diff'
+                become: true,
+                vaultCredentialsId: 'ansible-vault',
+                extras: '--diff'
+        } else {
+            Utils.markStageSkippedForConditional(STAGE_NAME)
+        }
     }
 }