trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1208534 - in /trafficserver/site/branches/ats-cms: build.sh install-fedora.sh lib/view.pm templates/docs_page.html
Date Wed, 30 Nov 2011 17:35:35 GMT
Author: amc
Date: Wed Nov 30 17:35:34 2011
New Revision: 1208534

URL: http://svn.apache.org/viewvc?rev=1208534&view=rev
Log:
More configuration options for build, better names, Fedora install help.

Added:
    trafficserver/site/branches/ats-cms/install-fedora.sh
Modified:
    trafficserver/site/branches/ats-cms/build.sh
    trafficserver/site/branches/ats-cms/lib/view.pm
    trafficserver/site/branches/ats-cms/templates/docs_page.html

Modified: trafficserver/site/branches/ats-cms/build.sh
URL: http://svn.apache.org/viewvc/trafficserver/site/branches/ats-cms/build.sh?rev=1208534&r1=1208533&r2=1208534&view=diff
==============================================================================
--- trafficserver/site/branches/ats-cms/build.sh (original)
+++ trafficserver/site/branches/ats-cms/build.sh Wed Nov 30 17:35:34 2011
@@ -19,6 +19,8 @@
 # Where the Apache CMS stuff lives. We might need to drill down to the build
 # directory if the luser has done a full checkout. Allow override from env.
 APACHE_CMS=${APACHE_CMS:-cms}
+# The target (output) directory.
+ATS_TARGET=${ATS_CMS_TARGET:-ats-cms-docroot}
 
 if [ -z "$MARKDOWN_SOCKET" ] ; then
     # What's the point of this? If the directory didn't exist, it's somewhat
@@ -36,9 +38,8 @@ fi;
 }
 
 # Where the ATS content lives.
-# Default to ats-cms but allow enviromental override.
 # Relative to the directory above the directory containing this script.
-ATS_CONTENT=${ATS_CONTENT:-ats-cms}
+ATS_CONTENT=${ATS_CMS_CONTENT:-ats-cms}
 
 if [ -d "../$APACHE_CMS/build" ] ; then
 	APACHE_CMS="$APACHE_CMS/build"
@@ -52,4 +53,4 @@ pgrep -f markdownd.py  >/dev/null || {
 }
 
 cd ..
-$PWD/$APACHE_CMS/build_site.pl --source-base ${ATS_CONTENT}  --target-base ats-cms-docroot
+$PWD/$APACHE_CMS/build_site.pl --source-base ${ATS_CONTENT}  --target-base $ATS_TARGET

Added: trafficserver/site/branches/ats-cms/install-fedora.sh
URL: http://svn.apache.org/viewvc/trafficserver/site/branches/ats-cms/install-fedora.sh?rev=1208534&view=auto
==============================================================================
--- trafficserver/site/branches/ats-cms/install-fedora.sh (added)
+++ trafficserver/site/branches/ats-cms/install-fedora.sh Wed Nov 30 17:35:34 2011
@@ -0,0 +1,12 @@
+yum install perl-XML-LibXML perl-XML-RSS python-markdown perl-CPAN  subversion-perl perl-CGI
+cpan install XML::Parser::Lite
+cpan install XML::RSS::Parser::Lite
+cpan install XML::Atom::Feed
+
+## Notes
+# For local testing, you need to
+# Change the HTTPD configuration AllowOveride under <Directory "/var/www/html"> to
"FileInfo Options"
+# To build directly to /var/www/html
+# export ATS_CMS_PAGE_BASE="/content"
+# export ATS_CMS_TARGET="/var/www/html"
+# The pages will be at http://localhost/content
\ No newline at end of file

Modified: trafficserver/site/branches/ats-cms/lib/view.pm
URL: http://svn.apache.org/viewvc/trafficserver/site/branches/ats-cms/lib/view.pm?rev=1208534&r1=1208533&r2=1208534&view=diff
==============================================================================
--- trafficserver/site/branches/ats-cms/lib/view.pm (original)
+++ trafficserver/site/branches/ats-cms/lib/view.pm Wed Nov 30 17:35:34 2011
@@ -457,7 +457,7 @@ sub single_narrative {
     
     ## Set globals.
     # base URL for the page. Pass it on to the template as well.
-    if (my $PAGE_BASE = $ENV{ATS_PAGE_BASE}) {
+    if ($PAGE_BASE = $ENV{ATS_CMS_PAGE_BASE}) {
         $args{page_base} = $PAGE_BASE;
     }
     # base output directory.

Modified: trafficserver/site/branches/ats-cms/templates/docs_page.html
URL: http://svn.apache.org/viewvc/trafficserver/site/branches/ats-cms/templates/docs_page.html?rev=1208534&r1=1208533&r2=1208534&view=diff
==============================================================================
--- trafficserver/site/branches/ats-cms/templates/docs_page.html (original)
+++ trafficserver/site/branches/ats-cms/templates/docs_page.html Wed Nov 30 17:35:34 2011
@@ -10,6 +10,7 @@
     type="application/atom+xml" title="{{ headers.atom.title }}" />
     {% endif %}
     <!-- The 1140px Grid - http://cssgrid.net/ -->
+    <!-- page_base = {{ page_base }} -->
     <link rel="stylesheet" type="text/css" href="{% if page_base %}{{ page_base }}{% endif
%}/styles/1140.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="{% if page_base %}{{ page_base }}{% endif
%}/styles/pygments_style.css" />
     <link rel="stylesheet" type="text/css" href="{% if page_base %}{{ page_base }}{% endif
%}/styles/styles.css" />
@@ -25,7 +26,7 @@
     <!-- Header -->
     <div class="row" id="header">
       <div class="fourcol">
-        <a href="http://trafficserver.apache.org/"><img class="logo" alt="Apache
Traffic Server" src="/images/trans_logo_350x69.png" /></a>
+        <a href="http://trafficserver.apache.org/"><img class="logo" alt="Apache
Traffic Server" src="{% if page_base %}{{ page_base }}{% endif %}/images/trans_logo_350x69.png"
/></a>
       </div>
       <div class="eightcol last" style="margin-top: 15px;">
         {% if headers.doc %}



Mime
View raw message