[PATCH] This was causing issues, can I get 2 +1's?

[Ricky Zhou]

On 2009-06-04 09:45:02 PM, Mike McGrath wrote:
> ---
>  manifests/services/fedoracommunity.pp |  186 ---------------------------------
>  1 files changed, 0 insertions(+), 186 deletions(-)
>  delete mode 100644 manifests/services/fedoracommunity.pp
> 
> diff --git a/manifests/services/fedoracommunity.pp b/manifests/services/fedoracommunity.pp
> deleted file mode 100644
> index 7b83e5b..0000000
> --- a/manifests/services/fedoracommunity.pp
> +++ /dev/null
> @@ -1,186 +0,0 @@
> -class bodhi-proxy inherits httpd {
> -    apachefile { "/etc/httpd/conf.d/admin.fedoraproject.org/bodhi.conf":
> -        source => "web/bodhi-proxy.conf"
> -    }
> -
> -    apachefile { "/etc/httpd/conf.d/admin.fedoraproject.org/bodhi-dev.conf":
> -        source => "web/bodhi-dev-proxy.conf"
> -    }
> -}
> -
> -class bodhi-supervised-server inherits turbogears {
> -    include supervisorApp
> -
> -    package { bodhi-server:
> -        ensure => present
> -    }
> -
> -    templatefile { '/etc/bodhi/bodhi.cfg':
> -        content => template('web/applications/bodhi-prod.cfg.erb'),
> -        owner => 'apache',
> -        group => 'apache',
> -        notify => Service['supervisord'],
> -        mode => '640',
> -        require => Package['bodhi-server'],
> -    }
> -}
> -
> -class bodhi-wsgi-server inherits turbogears {
> -    include httpd
> -    include mod_wsgi::module
> -
> -    package { bodhi-server:
> -        ensure => present
> -    }
> -
> -    templatefile { '/etc/bodhi/bodhi.cfg':
> -        content => template('web/applications/bodhi-prod.cfg.erb'),
> -        owner => 'apache',
> -        group => 'apache',
> -        notify => Service['httpd'],
> -        require => Package['httpd'],
> -        mode => '640',
> -        require => Package['bodhi-server']
> -    }
> -
> -    apachetemplate { '/etc/httpd/conf.d/bodhi.conf':
> -        content => template('web/applications/bodhi.conf.erb'),
> -        require => Package['mod_wsgi']
> -    }
> -
> -    folder { "/etc/pki/bodhi/":
> -        owner => 'apache',
> -        group => 'apache',
> -        mode => '0710',
> -        source => "blank/"
> -    }
> -
> -    cert { '/etc/pki/bodhi/bodhi.pem':
> -        source => 'secure/bodhi_key_and_cert.pem',
> -        owner => 'apache',
> -        mode => '0440'
> -    }
> -
> -    # The next two are actually public keys
> -    configfile { '/etc/pki/bodhi/fedora-server-ca.cert':
> -        source => 'secure/fedora-ca.cert',
> -    }
> -
> -    configfile { '/etc/pki/bodhi/fedora-upload-ca.cert':
> -        source => 'secure/fedora-ca.cert',
> -    }
> -
> -    #apachefile { '/etc/bodhi.wsgi':
> -    apachefile { '/usr/share/bodhi/bodhi.wsgi':
> -        source => 'web/applications/bodhi.wsgi',
> -        require => Package['mod_wsgi']
> -    }
> -
> -}
> -
> -class bodhi-app inherits bodhi-wsgi-server {
> -
> -    file { [ '/mnt/koji', '/mnt/koji/packages' ]:
> -        ensure => directory
> -    }
> -
> -    case $datacenter {
> -        'phx': {
> -            mount { "/mnt/koji/packages":
> -                device  => "nfs1.fedora.phx.redhat.com:/mnt/koji/packages",
> -                fstype  => "nfs",
> -                ensure  => "mounted",
> -                options => "defaults,ro,soft,intr,nfsvers=3",
> -                atboot  => true
> -            }
> -        }
> -    }
> -
> -}
> -
> -class bodhi-masher inherits bodhi-wsgi-server {
> -
> -    Templatefile['/etc/bodhi/bodhi.cfg'] {
> -	content => template('web/applications/bodhi-masher.cfg.erb'),
> -        owner => 'masher',
> -    }
> -
> -    file { '/etc/bodhi/f9-updates.mash':
> -        owner => 'masher',
> -        replace => false,
> -	require => Package['bodhi-server'],
> -    }
> -
> -    file { '/etc/bodhi/f9-updates-testing.mash':
> -        owner => 'masher',
> -        replace => false,
> -	require => Package['bodhi-server'],
> -    }
> -
> -    file { '/etc/bodhi/f8-updates.mash':
> -        owner => 'masher',
> -        replace => false,
> -	require => Package['bodhi-server'],
> -    }
> -
> -    file { '/etc/bodhi/f8-updates-testing.mash':
> -        owner => 'masher',
> -        replace => false,
> -	require => Package['bodhi-server'],
> -    }
> -
> -    file { '/etc/bodhi/mash.conf':
> -        owner => 'masher',
> -        replace => false,
> -	require => Package['bodhi-server'],
> -    }
> -
> -
> -    Apachetemplate['/etc/httpd/conf.d/bodhi.conf'] {
> -        content => template('web/applications/bodhi-masher.conf.erb'),
> -    }
> -
> -    folder { '/var/log/bodhi':
> -	source => 'blank/',
> -        ensure => directory,
> -        owner => 'masher',
> -        replace => false,
> -    }
> -
> -    folder { '/usr/share/bodhi':
> -	source => 'blank/',
> -        ensure => directory,
> -        owner => 'masher',
> -        replace => false,
> -	require => Package['bodhi-server'],
> -    }
> -
> -    Folder["/etc/pki/bodhi/"] {
> -        owner => 'masher',
> -        group => 'masher',
> -        mode => '0710',
> -        source => "blank/"
> -    }
> -
> -    Cert['/etc/pki/bodhi/bodhi.pem'] {
> -        source => 'secure/bodhi_key_and_cert.pem',
> -        owner => 'masher',
> -        mode => '0440'
> -    }
> -
> -    semanage_fcontext { '/home/masher/.cvspass':
> -        type => 'httpd_sys_script_rw_t'
> -    }
> -
> -    semanage_fcontext { '/usr/share/bodhi/comps(/.*)?':
> -        type => 'httpd_sys_script_rw_t'
> -    }
> -
> -}
> -
> -class bodhi-dev inherits bodhi-wsgi-server {
> -
> -    Templatefile['/etc/bodhi/bodhi.cfg'] {
> -	content => template('web/applications/bodhi-dev.cfg.erb'),
> -    }
> -}
> -- 
> 1.5.5.6
+1, mmcrath and J5 discussed this on IRC too.

Thanks,
Ricky
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
Url : http://lists.fedoraproject.org/pipermail/infrastructure/attachments/20090604/46dbcad9/attachment.bin