diff --git a/manifests/site.pp b/manifests/site.pp index 633083f2d1..e53ddeb947 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -541,7 +541,9 @@ node /^pholio\d+\.openstack\.org$/ { iptables_public_tcp_ports => [22, 80, 443], sysadmins => hiera('sysadmins', []), } - class { 'openstack_project::pholio': + class { '::phabricator': + httpd_admin_email => hiera('infra_apache_serveradmin'), + httpd_vhost_name => 'pholio.openstack.org'), mysql_user_password => hiera('pholio_mysql_user_password'), mysql_root_password => hiera('pholio_mysql_root_password'), ssl_cert_file_contents => hiera('ssl_cert_file_contents'), diff --git a/modules/openstack_project/manifests/pholio.pp b/modules/openstack_project/manifests/pholio.pp deleted file mode 100644 index a1a3178cc9..0000000000 --- a/modules/openstack_project/manifests/pholio.pp +++ /dev/null @@ -1,26 +0,0 @@ -# == Class: openstack_project::pholio -# - -class openstack_project::pholio ( - $mysql_root_password, - $mysql_user_password, - $ssl_cert_file = undef, - $ssl_key_file = undef, - $ssl_chain_file = undef, - $ssl_cert_file_contents = undef, - $ssl_key_file_contents = undef, - $ssl_chain_file_contents = undef, -) { - - class { '::phabricator': - mysql_root_password => $mysql_root_password, - mysql_user_password => $mysql_user_password, - ssl_cert_file => $ssl_cert_file, - ssl_key_file => $ssl_key_file, - ssl_chain_file => $ssl_chain_file, - ssl_cert_file_contents => $ssl_cert_file_contents, - ssl_key_file_contents => $ssl_key_file_contents, - ssl_chain_file_contents => $ssl_chain_file_contents, - } - -}