From cd6b9709d5b8efd553ba6d064ee77e815d2031ed Mon Sep 17 00:00:00 2001 From: Naveen MaliK Date: Wed, 25 Jun 2008 20:08:02 -0400 Subject: Moved docs into everest-repo rpm, no longer using git and puppet for docs. --- .gitignore | 1 + everest-repo/everest-repo-1.0.0/docs.conf | 13 ++++++ everest-repo/everest-repo-1.0.0/docs/.gitignore | 1 - .../everest_module/manifests/init.pp | 48 ---------------------- .../everest_module/templates/docs.conf.erb | 13 ------ everest-repo/everest-repo.spec | 19 +++++---- 6 files changed, 26 insertions(+), 69 deletions(-) create mode 100644 everest-repo/everest-repo-1.0.0/docs.conf delete mode 100644 everest-repo/everest-repo-1.0.0/docs/.gitignore delete mode 100644 everest-repo/everest-repo-1.0.0/everest_module/templates/docs.conf.erb diff --git a/.gitignore b/.gitignore index 27a6307..0ef8cd6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ pkg/* *.swp *.rpm +tmp diff --git a/everest-repo/everest-repo-1.0.0/docs.conf b/everest-repo/everest-repo-1.0.0/docs.conf new file mode 100644 index 0000000..85a0740 --- /dev/null +++ b/everest-repo/everest-repo-1.0.0/docs.conf @@ -0,0 +1,13 @@ +# These aliases are order dependent +AliasMatch ^/docs/(.*?)/(.*) /pub/docs/$1/en-US/html-single/$2 +Alias /docs "/pub/docs" + + Options Indexes FollowSymLinks Includes + AllowOverride None + Order allow,deny + Allow from all + + +# Eventually we'll have a landing page but for now we just redirect to the docs +RewriteEngine On +RewriteRule ^/$ /docs/everest/ [R] diff --git a/everest-repo/everest-repo-1.0.0/docs/.gitignore b/everest-repo/everest-repo-1.0.0/docs/.gitignore deleted file mode 100644 index 46b02ae..0000000 --- a/everest-repo/everest-repo-1.0.0/docs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*/**/tmp/* diff --git a/everest-repo/everest-repo-1.0.0/everest_module/manifests/init.pp b/everest-repo/everest-repo-1.0.0/everest_module/manifests/init.pp index 73636fa..7af239a 100644 --- a/everest-repo/everest-repo-1.0.0/everest_module/manifests/init.pp +++ b/everest-repo/everest-repo-1.0.0/everest_module/manifests/init.pp @@ -105,53 +105,6 @@ class everest { } } - class docsrepo inherits base { - include httpd - $docs_dir = "/pub/docs" - $pn = "publican" # publican namespace - - package { "publican": - ensure => installed, - } - - #This must be owned by the local user for the post-receive hook to work - exec { "Clone docs working repo": - user => $user, - group => $user, - command => "/usr/bin/git clone /pub/git/docs", - creates => "/pub/docs", - notify => Exec["Initial docs build"], - before => File["/pub/git/docs/hooks/post-receive"], - } - - file { "/pub/git/docs/hooks/post-receive": - ensure => present, - mode => 0755, - owner => $user, - group => $user, - content => template("everest/post-receive-docs.erb"), - } - - $num_generated = "find ${docs_dir}/${pn}/ -name tmp -type d | wc -l" - $num_projects = "find ${docs_dir}/${pn}/ -name Makefile | wc -l" - exec { "Initial docs build": - path => "/bin:/usr/bin", - user => $user, - group => $user, - command => "find ${docs_dir}/${pn}/ -name Makefile -execdir make html-single {} +", - unless => "[ `$num_generated` == `$num_projects` ]", - # ensure we have the correct ownership - require => File["/pub"], - } - - file { "/etc/httpd/conf.d/docs.conf": - ensure => present, - mode => 0644, - content => template("everest/docs.conf.erb"), - notify => Service["httpd"], - } - } - class puppet inherits base { $puppetdir = "/etc/puppet" @@ -316,7 +269,6 @@ class everest { include puppet include gitrepo include cobbler - include docsrepo package { "rubygem-everestd": ensure => installed, diff --git a/everest-repo/everest-repo-1.0.0/everest_module/templates/docs.conf.erb b/everest-repo/everest-repo-1.0.0/everest_module/templates/docs.conf.erb deleted file mode 100644 index a8424d3..0000000 --- a/everest-repo/everest-repo-1.0.0/everest_module/templates/docs.conf.erb +++ /dev/null @@ -1,13 +0,0 @@ -# These aliases are order dependent -AliasMatch ^/docs/(.*?)/(.*) /pub/docs/publican/$1/tmp/en-US/html-single/$2 -Alias /docs "/pub/docs/publican" - - Options Indexes FollowSymLinks Includes - AllowOverride None - Order allow,deny - Allow from all - - -# Eventually we'll have a landing page but for now we just redirect to the docs -RewriteEngine On -RewriteRule ^/$ /docs/everest/ [R] diff --git a/everest-repo/everest-repo.spec b/everest-repo/everest-repo.spec index ae95f3a..9a94f2a 100644 --- a/everest-repo/everest-repo.spec +++ b/everest-repo/everest-repo.spec @@ -7,7 +7,6 @@ Group: Applications/System License: GPL URL: http://everest-repo.usersys.redhat.com Source0: %{name}-%{version}.tar.gz -Source1: %{name}-docs.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -18,6 +17,7 @@ Requires: cobbler <= 1.1.0 Requires: yum-utils Requires: syslinux Requires: gitweb +Requires: httpd Requires: git-daemon #Technically we need git-all on Fedora 9 Requires: git @@ -32,22 +32,24 @@ everest-sync tool. %prep %setup -c 0 -%setup -c -a 1 %build - +pushd docs +make clean pdf html html-single +popd %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/pub -mkdir -p $RPM_BUILD_ROOT/pub/git/puppet +mkdir -p $RPM_BUILD_ROOT/pub/docs/everest mkdir -p $RPM_BUILD_ROOT/etc/everest mkdir -p $RPM_BUILD_ROOT/etc/puppet/modules mkdir -p $RPM_BUILD_ROOT/etc/init.d +mkdir -p $RPM_BUILD_ROOT/pub/git/puppet +mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d + +cp -r docs/tmp/* $RPM_BUILD_ROOT/pub/docs/everest -# TODO: should build the docs -cp -r docs $RPM_BUILD_ROOT/pub/docs cp -r everest_module $RPM_BUILD_ROOT/etc/puppet/modules/everest # TODO: These are config files @@ -57,6 +59,8 @@ cp bootstrap.pp $RPM_BUILD_ROOT/etc/everest cp everest-repo-bootstrap $RPM_BUILD_ROOT/etc/init.d +cp docs.conf $RPM_BUILD_ROOT/etc/httpd/conf.d + %clean rm -rf $RPM_BUILD_ROOT @@ -67,6 +71,7 @@ rm -rf $RPM_BUILD_ROOT /etc/puppet/modules/everest /etc/init.d/everest-repo-bootstrap /pub/docs +/etc/httpd/conf.d %doc -- cgit