dustin
/
configpolicy
1
1
Fork 0
Code Issues Releases Activity

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

jenkins-master
Dustin 2021-10-16 21:54:36 -05:00
parent 8e9699810b c861d2f70a
commit f3c4b4d174
3 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ci/homeassistant.jenkinsfile
View File

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

1
roles/websites/proxy-nextcloud/templates/nextcloud.httpd.conf.j2
View File

@ -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>

43
vars/applyConfigPolicy.groovy
View File

@ -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') {
ansiblePlaybook \
playbook: 'remount.yml',
limit: limit,
become: true,
vaultCredentialsId: 'ansible-vault',
extraVars: [
remount_state: 'rw',
]
def STAGE_NAME = 'Remount R/W'
stage(STAGE_NAME) {
if (limit) {
ansiblePlaybook \
playbook: 'remount.yml',
limit: limit,
become: true,
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') {
ansiblePlaybook \
playbook: 'remount.yml',
limit: limit + ':!rw-root',
become: true,
vaultCredentialsId: 'ansible-vault',
extras: '--diff'
def STAGE_NAME = 'Remount R/W'
stage(STAGE_NAME) {
if (limit) {
ansiblePlaybook \
playbook: 'remount.yml',
limit: limit + ':!rw-root',
become: true,
vaultCredentialsId: 'ansible-vault',
extras: '--diff'
} else {
Utils.markStageSkippedForConditional(STAGE_NAME)
}
}
}