Make bandersnatch::httpd class
So that apache may be controlled separately. Change-Id: Id35ed8fd0cacc1fbdc77b811a4386718f9785a77
This commit is contained in:
parent
08b809cd6d
commit
2940279e8a
|
@ -0,0 +1,42 @@
|
|||
# Copyright 2015 Hewlett-Packard Development Company, L.P.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
#
|
||||
# = Class: bandersnatch::httpd
|
||||
#
|
||||
# Class to set up bandersnatch web hosting.
|
||||
#
|
||||
class bandersnatch::httpd (
|
||||
$vhost_name,
|
||||
$mirror_root = '/srv/static/mirror',
|
||||
$user = 'root',
|
||||
$group = 'root',
|
||||
) {
|
||||
include ::httpd
|
||||
|
||||
::httpd::vhost { $vhost_name:
|
||||
port => 80,
|
||||
priority => '50',
|
||||
docroot => "${mirror_root}/web",
|
||||
require => File["${mirror_root}/web"],
|
||||
}
|
||||
|
||||
file { "${mirror_root}/web/robots.txt":
|
||||
ensure => present,
|
||||
owner => $user,
|
||||
group => $group,
|
||||
mode => '0444',
|
||||
source => 'puppet:///modules/bandersnatch/robots.txt',
|
||||
require => File["${mirror_root}/web"],
|
||||
}
|
||||
}
|
|
@ -17,7 +17,6 @@
|
|||
# Class to set up bandersnatch mirroring.
|
||||
#
|
||||
class bandersnatch::mirror (
|
||||
$vhost_name,
|
||||
$mirror_root = '/srv/static/mirror',
|
||||
$static_root = '/srv/static',
|
||||
$user = 'root',
|
||||
|
@ -45,24 +44,6 @@ class bandersnatch::mirror (
|
|||
require => File[$mirror_root],
|
||||
}
|
||||
|
||||
include ::httpd
|
||||
|
||||
::httpd::vhost { $vhost_name:
|
||||
port => 80,
|
||||
priority => '50',
|
||||
docroot => "${mirror_root}/web",
|
||||
require => File["${mirror_root}/web"],
|
||||
}
|
||||
|
||||
file { "${mirror_root}/web/robots.txt":
|
||||
ensure => present,
|
||||
owner => $user,
|
||||
group => $group,
|
||||
mode => '0444',
|
||||
source => 'puppet:///modules/bandersnatch/robots.txt',
|
||||
require => File["${mirror_root}/web"],
|
||||
}
|
||||
|
||||
file { '/etc/bandersnatch.conf':
|
||||
ensure => present,
|
||||
content => template('bandersnatch/bandersnatch.conf.erb'),
|
||||
|
|
Loading…
Reference in New Issue