Skip to content
Browse files

Further refactoring of level 2, adding hosts entries for all machines

  • Loading branch information...
1 parent 06c2b6b commit 31dee51ec4657b8f93b5afa011df7f1cc6910ba1 @e28eta committed
View
36 puppet/manifests/hostnames.pp
@@ -0,0 +1,36 @@
+
+host {'level00-1.stripe-ctf.com':
+ ip => '192.168.33.100',
+}
+
+host {'level01-1.stripe-ctf.com':
+ ip => '192.168.33.101',
+}
+
+host {'level02-1.stripe-ctf.com':
+ ip => '192.168.33.102',
+}
+
+host {'level03-1.stripe-ctf.com':
+ ip => '192.168.33.103',
+}
+
+host {'level04-1.stripe-ctf.com':
+ ip => '192.168.33.104',
+}
+
+host {'level05-1.stripe-ctf.com':
+ ip => '192.168.33.105',
+}
+
+host {'level06-1.stripe-ctf.com':
+ ip => '192.168.33.106',
+}
+
+host {'level07-1.stripe-ctf.com':
+ ip => '192.168.33.107',
+}
+
+host {'level08-1.stripe-ctf.com':
+ ip => '192.168.33.108',
+}
View
2 ...dules/stripectf2/manifests/apache2site.pp → ...ules/stripectf2/manifests/apache2_site.pp
@@ -2,7 +2,7 @@
# Define an apache2 site. Place all site configs into
# /etc/apache2/sites-available and en-/disable them with this type.
-define stripectf2::apache2site ( $ensure = 'present' ) {
+define stripectf2::apache2_site ( $ensure = 'present' ) {
$apache2_sites = "/etc/apache2/sites"
case $ensure {
'present' : {
View
4 puppet/modules/stripectf2/manifests/level02.pp
@@ -40,10 +40,10 @@
$document_root = $destination
file {'/etc/apache2/sites-available/level02':
- content => template('stripectf2/apache2-site-config.erb'),
+ content => template('stripectf2/apache2_site_config.erb'),
}
- stripectf2::apache2site {'level02':
+ stripectf2::apache2_site {'level02':
ensure => 'present',
require => File['/etc/apache2/sites-available/level02'],
}
View
7 puppet/manifests/level05.pp → ...t/modules/stripectf2/manifests/level05.pp
@@ -37,10 +37,3 @@
start => 'cd /level5 && bundle install && ./srv.rb &',
provider => 'base',
}
-
-host {'level05-1.stripe-ctf.com':
- ip => '192.168.33.105',
-}
-host {'level02-1.stripe-ctf.com':
- ip => '192.168.33.102',
-}
View
0 ...ipectf2/templates/apache2-site-config.erb → ...ipectf2/templates/apache2_site_config.erb
File renamed without changes.
View
5 puppet/site.pp
@@ -1,7 +1,7 @@
# This file contains default actions to be run, and includes everything from nodes/
# The node specific file (ex: nodes/level02.pp) does level-specific provisioning
-#import "manifests/**/*.pp"
+import "manifests/**/*.pp"
import "nodes/**/*.pp"
# Set up a default path
@@ -18,6 +18,7 @@
}
# Disable the default apache2 site
-stripectf2::apache2site {'000-default':
+stripectf2::apache2_site {'000-default':
ensure => 'absent',
}
+

0 comments on commit 31dee51

Please sign in to comment.
Something went wrong with that request. Please try again.