From d8184191da2d21402ebafb67b0f1ced8e1fd38f7 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 28 Mar 2013 14:49:10 -0700 Subject: [PATCH] Reorganize static manifest. No functional changes, only moving code, except one correction to add perms and require for the docs-draft directory. Change-Id: I794810645c477181632bf03648fde1750f4f4a02 Reviewed-on: https://review.openstack.org/25662 Reviewed-by: Clark Boylan Approved: James E. Blair Tested-by: Jenkins --- modules/openstack_project/manifests/static.pp | 147 ++++++++++-------- 1 file changed, 84 insertions(+), 63 deletions(-) diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp index 1521a9a4c0..15282917e1 100644 --- a/modules/openstack_project/manifests/static.pp +++ b/modules/openstack_project/manifests/static.pp @@ -29,6 +29,13 @@ class openstack_project::static ( ensure => present, } + file { '/srv/static': + ensure => directory, + } + + ########################################################### + # Tarballs + apache::vhost { 'tarballs.openstack.org': port => 80, priority => '50', @@ -36,47 +43,6 @@ class openstack_project::static ( require => File['/srv/static/tarballs'], } - apache::vhost { 'ci.openstack.org': - port => 80, - priority => '50', - docroot => '/srv/static/ci', - require => File['/srv/static/ci'], - } - - apache::vhost { 'logs.openstack.org': - port => 80, - priority => '50', - docroot => '/srv/static/logs', - require => File['/srv/static/logs'], - template => 'openstack_project/logs.vhost.erb', - } - - apache::vhost { 'pypi.openstack.org': - port => 80, - priority => '50', - docroot => '/srv/static/pypi', - require => File['/srv/static/pypi'], - } - - apache::vhost { 'docs-draft.openstack.org': - port => 80, - priority => '50', - docroot => '/srv/static/docs-draft', - require => File['/srv/static/docs-draft'], - } - - apache::vhost { 'status.openstack.org': - port => 80, - priority => '50', - docroot => '/srv/static/status', - template => 'openstack_project/status.vhost.erb', - require => File['/srv/static/status'], - } - - file { '/srv/static': - ensure => directory, - } - file { '/srv/static/tarballs': ensure => directory, owner => 'jenkins', @@ -84,6 +50,16 @@ class openstack_project::static ( require => User['jenkins'], } + ########################################################### + # CI + + apache::vhost { 'ci.openstack.org': + port => 80, + priority => '50', + docroot => '/srv/static/ci', + require => File['/srv/static/ci'], + } + file { '/srv/static/ci': ensure => directory, owner => 'jenkins', @@ -91,14 +67,18 @@ class openstack_project::static ( require => User['jenkins'], } - file { '/srv/static/logs': - ensure => directory, - owner => 'jenkins', - group => 'jenkins', - require => User['jenkins'], + ########################################################### + # Logs + + apache::vhost { 'logs.openstack.org': + port => 80, + priority => '50', + docroot => '/srv/static/logs', + require => File['/srv/static/logs'], + template => 'openstack_project/logs.vhost.erb', } - file { '/srv/static/pypi': + file { '/srv/static/logs': ensure => directory, owner => 'jenkins', group => 'jenkins', @@ -114,17 +94,29 @@ class openstack_project::static ( require => File['/srv/static/logs'], } - file { '/srv/static/pypi/robots.txt': - ensure => present, - owner => 'root', - group => 'root', - mode => '0444', - source => 'puppet:///modules/openstack_project/disallow_robots.txt', - require => File['/srv/static/pypi'], + cron { 'gziplogs': + user => 'root', + minute => '0', + hour => '*/6', + command => 'sleep $((RANDOM\%600)) && flock -n /var/run/gziplogs.lock find /srv/static/logs/ -type f -not -name robots.txt -not -name \*.gz \( -name \*.txt -or -name \*.html -or -name tmp\* \) -exec gzip \{\} \;', + environment => 'PATH=/var/lib/gems/1.8/bin:/usr/bin:/bin:/usr/sbin:/sbin', + } + + ########################################################### + # Docs-draft + + apache::vhost { 'docs-draft.openstack.org': + port => 80, + priority => '50', + docroot => '/srv/static/docs-draft', + require => File['/srv/static/docs-draft'], } file { '/srv/static/docs-draft': - ensure => directory, + ensure => directory, + owner => 'jenkins', + group => 'jenkins', + require => User['jenkins'], } file { '/srv/static/docs-draft/robots.txt': @@ -136,6 +128,43 @@ class openstack_project::static ( require => File['/srv/static/docs-draft'], } + ########################################################### + # Pypi Mirror + + apache::vhost { 'pypi.openstack.org': + port => 80, + priority => '50', + docroot => '/srv/static/pypi', + require => File['/srv/static/pypi'], + } + + file { '/srv/static/pypi': + ensure => directory, + owner => 'jenkins', + group => 'jenkins', + require => User['jenkins'], + } + + file { '/srv/static/pypi/robots.txt': + ensure => present, + owner => 'root', + group => 'root', + mode => '0444', + source => 'puppet:///modules/openstack_project/disallow_robots.txt', + require => File['/srv/static/pypi'], + } + + ########################################################### + # Status + + apache::vhost { 'status.openstack.org': + port => 80, + priority => '50', + docroot => '/srv/static/status', + template => 'openstack_project/status.vhost.erb', + require => File['/srv/static/status'], + } + file { '/srv/static/status': ensure => directory, } @@ -152,14 +181,6 @@ class openstack_project::static ( require => File['/srv/static/status'], } - cron { 'gziplogs': - user => 'root', - minute => '0', - hour => '*/6', - command => 'sleep $((RANDOM\%600)) && flock -n /var/run/gziplogs.lock find /srv/static/logs/ -type f -not -name robots.txt -not -name \*.gz \( -name \*.txt -or -name \*.html -or -name tmp\* \) -exec gzip \{\} \;', - environment => 'PATH=/var/lib/gems/1.8/bin:/usr/bin:/bin:/usr/sbin:/sbin', - } - include reviewday reviewday::site { 'reviewday':