diff --git a/Jenkinsfile b/Jenkinsfile index ed33c7a..6e6d084 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,7 +57,6 @@ pipeline { sh ''' git config user.name "Jenkins Server" git config user.email jenkins@confdroid.com - git rm -r --cached docs || echo "No docs to remove from git" git rm -r --cached .vscode || echo "No .vscode to remove from git" git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit" git push origin HEAD:master diff --git a/README.md b/README.md index 4e7f114..3a93eff 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ cd /path/to/your/repositories git clone https://sourcecode.confdroid.com/confdroid/control_repo_template.git r10k-control-repo ``` - use your favorite editor or IDE to edit files +- the site.pp example only contains suggestions. Fill in to your requirements. ## Contact Us diff --git a/environment.conf b/environment.conf new file mode 100644 index 0000000..2f9bdfa --- /dev/null +++ b/environment.conf @@ -0,0 +1,3 @@ +manifest = manifests/site.pp +modulepath = modules:site + diff --git a/manifests/site.pp b/manifests/site.pp new file mode 100644 index 0000000..6ba09e7 --- /dev/null +++ b/manifests/site.pp @@ -0,0 +1,28 @@ +### Site.pp for the environment @ + +### variable for the puppet master +$puppetserver = '' + +# exec paths +Exec { path => ['/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/'] } + +# create file bucket for backups +filebucket { 'main': + path => false, # This is required for remote filebuckets. +} + +# create backups when replacing files +File { backup => main, } + +# virtual packages +Package { + allow_virtual => false, +} + +### global firewall ### +Firewall { + before => Class['my-fw::post'], + require => Class['my-fw::pre'], +} +class {['my-fw::pre', 'my-fw::post']: } +class { 'my-fw': }