Skip to content
Open

Dev2 #10

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
26 changes: 0 additions & 26 deletions apache/manifests/config.pp

This file was deleted.

6 changes: 0 additions & 6 deletions apache/manifests/init.pp

This file was deleted.

12 changes: 0 additions & 12 deletions apache/manifests/site.pp

This file was deleted.

23 changes: 23 additions & 0 deletions foreman/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>foreman</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
</projectDescription>
6 changes: 6 additions & 0 deletions foreman/Modulefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
name 'marcellods-foreman'
version '0.0.2'

author 'Ohad Levy'
license ''
dependency 'marcellods/smart_modules'
4 changes: 2 additions & 2 deletions foreman/manifests/config/passenger.pp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class foreman::config::passenger {
include apache::ssl
include ::passenger
include smart_modules::apache::ssl
include smart_modules::passenger

file {"foreman_vhost":
path => "${foreman::params::apache_conf_dir}/foreman.conf",
Expand Down
34 changes: 34 additions & 0 deletions foreman/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"name": "marcellods-foreman",
"author": "Ohad Levy",
"description": "",
"license": "",
"project_page": "",
"source": "",
"summary": "",
"version": "0.0.2",
"checksums": {
"Modulefile": "6ac303d52fb2fef1d0560aa28fa4cb6c",
"lib\\puppet\\parser\\functions\\foreman.rb": "fddf65a65b9d5371d6ad02a451ea0683",
"lib\\puppet\\parser\\functions\\smartvar.rb": "1135655507e691d311cf4e6e65f93556",
"manifests\\config.pp": "cbce4a5962c3f5e651d90626ba61e447",
"manifests\\config\\enc.pp": "91e3ef6bb0f8850d5bff3105272ecc78",
"manifests\\config\\passenger.pp": "18d5f8e2abcc06ee3ec14142a1195f32",
"manifests\\config\\reports.pp": "fb56a3f26e243d51684c4b3ad5853823",
"manifests\\init.pp": "37c9101280241eb86c4fe70775b78615",
"manifests\\install.pp": "72e328d7e7bd98a95a1af58a33f6067a",
"manifests\\install\\repos.pp": "2d77774c73d7b82494e2152f223dbd64",
"manifests\\params.pp": "af2e61d1fe87d198aa5117c1864a0a83",
"manifests\\service.pp": "38a461d67cf244ae96bd39655163b2b6",
"templates\\database.yaml.erb": "57194f3432d602f0f55a4b6f5d98a234",
"templates\\external_node.rb.erb": "47b3fd1f354d435e589bf1fe25299d22",
"templates\\foreman-report.rb.erb": "29cf5f3ed2b0b0399cbd8d1a6e137ff0",
"templates\\foreman-vhost.conf.erb": "f95d3e631332ec7da85e8e8c35bddfb3",
"templates\\settings.yaml.erb": "7020b74aae6c04c9285115fa1e0e207b"
},
"dependencies": [
{
"name": "marcellods/smart_modules"
}
]
}
23 changes: 23 additions & 0 deletions foreman_proxy/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>foreman_proxy</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
</projectDescription>
7 changes: 7 additions & 0 deletions foreman_proxy/Modulefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name 'marcellods-foreman_proxy'
version '0.0.2'

author 'Ohad Levy'
license ''
dependency 'marcellods/smart_modules'
dependency 'marcellods/foreman'
4 changes: 2 additions & 2 deletions foreman_proxy/manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
$puppetrun_cmd = "/usr/sbin/puppetrun"

# TFTP settings
require "tftp" # ensures we can access tftp module parameters
require "smart_modules" # ensures we can access tftp module parameters
$tftp = true
$syslinux_root = "/usr/share/syslinux"
$syslinux_files = ["pxelinux.0","menu.c32","chain.c32"]
$tftproot = $tftp::params::root
$tftproot = $smart_modules::tftp::params::root
$tftp_dir = ["${tftproot}/pxelinux.cfg","${tftproot}/boot"]

$dhcp = false
Expand Down
16 changes: 8 additions & 8 deletions foreman_proxy/manifests/tftp.pp
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
class foreman_proxy::tftp {
include ::tftp
include smart_modules::tftp

file{ $foreman_proxy::params::tftp_dir:
ensure => directory,
owner => $foreman_proxy::params::user,
mode => 644,
mode => '0644',
require => Class["foreman_proxy::install"],
ensure => directory,
recurse => true;
}

link_file{$foreman_proxy::params::syslinux_files:
sync_file{$foreman_proxy::params::syslinux_files:
source_path => $foreman_proxy::params::syslinux_root,
target_path => $foreman_proxy::params::tftproot,
require => Class["tftp::install"];
require => Class["smart_modules::tftp::install"];
}
}
define link_file($source_path, $target_path) {
define sync_file($source_path, $target_path) {
file{"$target_path/$name":
ensure => link,
target => "$source_path/$name"
ensure => present,
source => "$source_path/$name"
}
}
29 changes: 29 additions & 0 deletions foreman_proxy/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"name": "marcellods-foreman_proxy",
"author": "Ohad Levy",
"description": "",
"license": "",
"project_page": "",
"source": "",
"summary": "",
"version": "0.0.2",
"checksums": {
"Modulefile": "72cbd1bfd5da454510bc3ffa457a2a4e",
"manifests\\config.pp": "d6c5a1e11c994da8fc693a73fcae24d2",
"manifests\\init.pp": "d636fdcd3aa2c44f075e499fbdf8e1a9",
"manifests\\install.pp": "983b631f5531bc2ae35c7efe204f0829",
"manifests\\params.pp": "725ac0e1066068b578d88da4e7319635",
"manifests\\puppetca.pp": "e7acddf69eceee360bfe61759fbae67b",
"manifests\\service.pp": "ab51e7b1f59ad78ce3d8559791f01603",
"manifests\\tftp.pp": "c450aa3c372a620d522194e8c95a2aea",
"templates\\settings.yml.erb": "f12b87c2e0ef5ce329db5aefeef23222"
},
"dependencies": [
{
"name": "marcellods/smart_modules"
},
{
"name": "marcellods/foreman"
}
]
}
11 changes: 11 additions & 0 deletions foreman_proxy/templates/server/puppet-server.conf.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

[master]
autosign = $confdir/autosign.conf { mode = 664 }
reports = foreman
external_nodes = /etc/puppet/node.rb
node_terminus = exec

<% scope.lookupvar("foreman_proxy::puppet::params::environments").each do |env| -%>
[<%= env %>]
modulepath = <%= scope.lookupvar("foreman_proxy::puppet::params::modules_path") %>/<%= env %>:<%= scope.lookupvar("foreman_proxy::puppet::params::common_modules_path") %>
<% end -%>
5 changes: 0 additions & 5 deletions passenger/manifests/init.pp

This file was deleted.

7 changes: 0 additions & 7 deletions passenger/manifests/install.pp

This file was deleted.

10 changes: 0 additions & 10 deletions passenger/manifests/install/debian.pp

This file was deleted.

7 changes: 0 additions & 7 deletions puppet/manifests/config.pp

This file was deleted.

5 changes: 0 additions & 5 deletions puppet/manifests/init.pp

This file was deleted.

4 changes: 0 additions & 4 deletions puppet/manifests/server.pp

This file was deleted.

22 changes: 0 additions & 22 deletions puppet/manifests/server/config.pp

This file was deleted.

30 changes: 0 additions & 30 deletions puppet/manifests/server/passenger.pp

This file was deleted.

33 changes: 0 additions & 33 deletions puppet/templates/server/puppet-vhost.conf.erb

This file was deleted.

10 changes: 0 additions & 10 deletions puppet/templates/server/puppet.conf.erb

This file was deleted.

Loading