Skip to content

Commit

Permalink
remove dependencies to external modules
Browse files Browse the repository at this point in the history
  • Loading branch information
timogoebel committed Mar 20, 2017
1 parent 3d3d051 commit ad5cff7
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 10 deletions.
1 change: 0 additions & 1 deletion .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ fixtures:
extlib:
repo: 'https://github.com/puppet-community/puppet-extlib'
ref: 'v0.11.3'
foreman: "https://github.com/theforeman/puppet-foreman.git"
common: "https://github.com/katello/puppet-common.git"
trusted_ca: "https://github.com/evenup/evenup-trusted_ca.git"
concat: "https://github.com/puppetlabs/puppetlabs-concat"
Expand Down
2 changes: 0 additions & 2 deletions manifests/candlepin.pp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
target => $keystore,
owner => 'tomcat',
group => $::certs::group,
notify => Service[$tomcat],
}

Cert[$java_client_cert_name] ~>
Expand Down Expand Up @@ -108,7 +107,6 @@
owner => 'tomcat',
group => $::certs::group,
mode => '0640',
notify => Service[$tomcat],
}
}
}
6 changes: 1 addition & 5 deletions manifests/foreman_proxy.pp
Original file line number Diff line number Diff line change
Expand Up @@ -74,23 +74,19 @@
Cert[$proxy_cert_name] ~>
pubkey { $proxy_cert:
key_pair => Cert[$proxy_cert_name],
notify => Service['foreman-proxy'],
} ~>
privkey { $proxy_key:
key_pair => Cert[$proxy_cert_name],
notify => Service['foreman-proxy'],
} ->
pubkey { $proxy_ca_cert:
key_pair => $certs::default_ca,
notify => Service['foreman-proxy'],
} ~>
file { $proxy_key:
ensure => file,
owner => 'foreman-proxy',
group => $certs::group,
mode => '0400',
} ~>
Service['foreman-proxy']
}

Cert[$foreman_proxy_client_cert_name] ~>
pubkey { $foreman_ssl_cert:
Expand Down
3 changes: 1 addition & 2 deletions manifests/qpid.pp
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@
command => "pk12util -i '${pfx_path}' -d '${::certs::nss_db_dir}' -w '${nss_db_password_file}' -k '${nss_db_password_file}'",
path => '/usr/bin',
refreshonly => true,
} ~>
Service['qpidd']
}

Pubkey[$::certs::ca_cert] ~> Certs::Ssltools::Certutil['ca']
Pubkey[$client_cert] ~> Certs::Ssltools::Certutil['broker']
Expand Down

0 comments on commit ad5cff7

Please sign in to comment.