Browse files

netinstall define moved to puppi module

  • Loading branch information...
1 parent 7315363 commit 94d5a70b682bfa48ad026a464dc5fd79eba27b7f @alvagante alvagante committed Feb 28, 2012
View
54 common/manifests/netinstall.pp
@@ -1,54 +0,0 @@
-define netinstall (
- $url,
- $extracted_dir,
- $destination_dir,
- $owner = "root",
- $group = "root",
- $work_dir = "/var/tmp",
- $extract_command = "tar -zxvf",
- $preextract_command = "",
- $postextract_command = ""
- # $postextract_command = "./configure ; make ; make install"
- ) {
-
- $source_filename = urlfilename($url)
-
-if $preextract_command {
- exec {
- "PreExtract $source_filename":
- command => $preextract_command,
- before => Exec["Extract $source_filename"],
- refreshonly => true,
- }
-}
-
- exec {
- "Retrieve $url":
- cwd => "$work_dir",
- command => "wget $url",
- creates => "$work_dir/$source_filename",
- timeout => 3600,
- }
-
- exec {
- "Extract $source_filename":
- command => "mkdir -p $destination_dir && cd $destination_dir && $extract_command $work_dir/$source_filename",
- unless => "find $destination_dir | grep $extracted_dir",
- creates => "${destination_dir}/${extracted_dir}",
- require => Exec["Retrieve $url"],
- }
-
-if $postextract_command {
- exec {
- "PostExtract $source_filename":
- command => $postextract_command,
- cwd => "$destination_dir/$extracted_dir",
- subscribe => Exec["Extract $source_filename"],
- refreshonly => true,
- timeout => 3600,
- require => Exec["Retrieve $url"],
- }
-}
-
-}
-
View
2 drupal/manifests/drush.pp
@@ -7,7 +7,7 @@
require drupal::params
- netinstall { "netinstall_drush":
+ puppi::netinstall { "netinstall_drush":
url => "${drupal::params::drush_url}",
extracted_dir => "drush",
destination_dir => "${drupal::params::sitesdir}/all/modules",
2 jenkins
@@ -1 +1 @@
-Subproject commit 2b01f0387fbbc7954b0ed505f174906ea96d540e
+Subproject commit 2f14989df74d5abfaa797670ed834c6ab78aa53a
View
4 mailscanner/manifests/classes/mailwatch.pp
@@ -10,7 +10,7 @@
# $mailscanner_mysqlhost = "127.0.0.1"
# $mailscanner_mysqldbname = "mailscanner"
#
-# This class requires Example42 apache module (just for the php::module define) and Example42 common module (for the netinstall and config defines)
+# This class requires Example42 apache module (just for the php::module define) and Example42 puppi and common module (for the netinstall and config defines)
# NOTE: Due to molteplicy of relations, this class is tuned and tested for a
# Postfix + MailScanner + MailWatch installation on RedHat/Centos 5.
# You may need to fix and refine things for proper work under different setups.
@@ -45,7 +45,7 @@
# Download sources from official site
- netinstall { "mailwatch":
+ puppi::netinstall { "mailwatch":
url => "${mailscanner::params::mailwatch_source_url}",
extracted_dir => "${mailscanner::params::mailwatch_extracted_dir}",
postextract_command => "cp -a mailscanner ${mailscanner::params::mailwatch_webdir}",
View
2 mailscanner/manifests/classes/netinstall.pp
@@ -9,7 +9,7 @@
timeout => 3600,
}
- netinstall { mailscanner:
+ puppi::netinstall { mailscanner:
url => "${mailscanner::params::source_url}",
extracted_dir => "${mailscanner::params::extracted_dir}",
# preextract_command => "${mailscanner::params::preextract_command}",
View
4 postfix/manifests/postfixadmin.pp
@@ -11,7 +11,7 @@
# $postfix_mysqldbname = "postfix"
# $postfix_mynetworks = $network/$netmask
#
-# This class requires Example42 apache module (just for the php::module define) and Example42 common module (for the netinstall and config defines)
+# This class requires Example42 apache module (just for the php::module define) and Example42 puppi and common module (for the netinstall and config defines)
#
# You may have these components on separated servers or included on the same host
# Postfix (with Mysql support): include postfix::mysql
@@ -30,7 +30,7 @@
default: { php::module { [ mysql, mbstring, imap ]: } }
}
- netinstall { postfixadmin:
+ puppi::netinstall { postfixadmin:
url => "{postfix::params::postfixadmin_url}",
extracted_dir => "${postfix::params::postfixadmin_dirname}",
postextract_command => "ln -s ${postfix::params::postfixadmin_dirname} ../postfixadmin",
2 puppi
@@ -1 +1 @@
-Subproject commit 6ac522ab4100d6d3ab389676e78314820f5f314f
+Subproject commit ef4c03de381189c8d84aeb64c5851576743df1aa
View
2 rsyslog/manifests/server/loganalyzer.pp
@@ -12,7 +12,7 @@
php::module { mysql: }
php::module { gd: }
- netinstall { "netinstall_loganalyzer":
+ puppi::netinstall { "netinstall_loganalyzer":
url => "${rsyslog::params::loganalyzer_url}",
extracted_dir => "${rsyslog::params::loganalyzer_dirname}",
destination_dir => "${apache::params::documentroot}",
2 stdlib42
@@ -1 +1 @@
-Subproject commit 3bcfa1bdaf5ebab7b796edac978a7526da86299c
+Subproject commit f0bae5d5ac713534a1fa02ba24a6b0b2d0374a21
2 wordpress
@@ -1 +1 @@
-Subproject commit 641bd79b91739db3164752feb0ed6571d6bca5f7
+Subproject commit 56b37bba789d35ccd0547aac30da5899d028bfa9

0 comments on commit 94d5a70

Please sign in to comment.