Skip to content
This repository has been archived by the owner on Feb 27, 2022. It is now read-only.

Firewall #25

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion manifests/Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ mod "jenkins",
mod "apt",
:git => "git://github.com/puppetlabs/puppetlabs-apt.git"

mod "puppetlabs/firewall"

mod 'puppetlabs/stdlib'
mod 'puppetlabs/git'

Expand All @@ -23,4 +25,4 @@ mod 'erikwebb/drush'
mod 'puppetlabs/apache'
mod 'puppetlabs/mysql'
mod 'thias/php'
mod 'ScarceMedia/imagemagick'
mod 'ScarceMedia/imagemagick'
12 changes: 6 additions & 6 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
error /(?i)^error /

# match line containing '[error]', case-insensitive
error /(?i)\[error\]/
error /(?i)[error]/

# match line beginning with '[Fail]', case-insensitive
error /(?i)^fail/
Expand All @@ -37,14 +37,13 @@
Managed by Puppet.\n"
}

include jenkins
include git
include drush
include imagemagick
class { 'apache':
notify => [
exec['clean_urls_for_drupal'],
exec['allow_jenkins_virtual_hosts'],
Exec['clean_urls_for_drupal'],
Exec['allow_jenkins_virtual_hosts'],
],
}

Expand Down Expand Up @@ -83,8 +82,9 @@
class { '::mysql::server':
}

# don't use a firewall, see http://stackoverflow.com/questions/5984217
service { iptables: ensure => stopped }
class { 'jenkins':
configure_firewall => true
}

# Install git and dependencies, see
# https://github.com/jenkinsci/puppet-jenkins/issues/78
Expand Down
3 changes: 3 additions & 0 deletions manifests/modules/firewall/.fixtures.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fixtures:
symlinks:
"firewall": "#{source_dir}"
31 changes: 31 additions & 0 deletions manifests/modules/firewall/.nodeset.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---
default_set: 'centos-64-x64'
sets:
'centos-59-x64':
nodes:
"main.foo.vm":
prefab: 'centos-59-x64'
'centos-64-x64':
nodes:
"main.foo.vm":
prefab: 'centos-64-x64'
'fedora-18-x64':
nodes:
"main.foo.vm":
prefab: 'fedora-18-x64'
'debian-607-x64':
nodes:
"main.foo.vm":
prefab: 'debian-607-x64'
'debian-70rc1-x64':
nodes:
"main.foo.vm":
prefab: 'debian-70rc1-x64'
'ubuntu-server-10044-x64':
nodes:
"main.foo.vm":
prefab: 'ubuntu-server-10044-x64'
'ubuntu-server-12042-x64':
nodes:
"main.foo.vm":
prefab: 'ubuntu-server-12042-x64'
3 changes: 3 additions & 0 deletions manifests/modules/firewall/.sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
spec/spec_helper.rb:
unmanaged: true
17 changes: 17 additions & 0 deletions manifests/modules/firewall/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
language: ruby
bundler_args: --without system_tests
script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
matrix:
fast_finish: true
include:
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0"
notifications:
email: false
Loading