Permalink
Browse files

Remove Combust files from the `perlorg` "fork"

  • Loading branch information...
1 parent 1c36c40 commit e80edd9668e5bf7d8af821bc8305cf9954a401ec @abh abh committed Jun 10, 2011
Showing with 1 addition and 9,945 deletions.
  1. +1 −1 LICENSE
  2. +0 −25 PLACK.md
  3. +0 −61 TODO
  4. +0 −232 apache/bin/apachectl
  5. +0 −65 apache/conf/httpd2.tmpl
  6. +0 −592 apache/conf/mime.types
  7. +0 −24 apache/conf/startup.pl
  8. +0 −15 apache/root_templates/default_site/index.html
  9. +0 −6 apache/root_templates/error/404.html
  10. +0 −13 apache/root_templates/error/500.html
  11. +0 −14 apache/root_templates/error/error.html
  12. +0 −7 apache/root_templates/tpl/bitcard_login.html
  13. +0 −9 apache/root_templates/tpl/defaults
  14. +0 −1 apache/root_templates/tpl/style/bare.html
  15. +0 −39 apache/root_templates/tpl/style/default.html
  16. +0 −12 apache/root_templates/tpl/wrapper
  17. +0 −14 bin/cbconfig
  18. +0 −54 bin/cbcpan
  19. +0 −132 bin/cmysql
  20. +0 −1 bin/cmysqladmin
  21. +0 −1 bin/cmysqldump
  22. +0 −31 bin/cprove
  23. +0 −30 bin/cron/hourly
  24. +0 −201 bin/database_update
  25. +0 −109 bin/deploy/static_version_cache
  26. +0 −18 bin/diff_cpan_arch
  27. +0 −61 bin/httpd
  28. +0 −14 bin/make_configs
  29. +0 −46 bin/perl
  30. +0 −77 bin/run_httpd
  31. +0 −213 bin/scaffold_schema
  32. +0 −56 bin/svscan_boot
  33. +0 −26 lib/Combust.pm
  34. +0 −91 lib/Combust/API.pm
  35. +0 −34 lib/Combust/API/Base.pm
  36. +0 −6 lib/Combust/ApacheConfig.pm
  37. +0 −84 lib/Combust/ApacheConfig/Role.pm
  38. +0 −223 lib/Combust/App.pm
  39. +0 −109 lib/Combust/App/ApacheRouters.pm
  40. +0 −46 lib/Combust/Base.pm
  41. +0 −179 lib/Combust/Cache.pm
  42. +0 −139 lib/Combust/Cache/DBI.pm
  43. +0 −128 lib/Combust/Cache/Memcached.pm
  44. +0 −350 lib/Combust/Config.pm
  45. +0 −22 lib/Combust/Constant.pm
  46. +0 −499 lib/Combust/Control.pm
  47. +0 −97 lib/Combust/Control/API.pm
  48. +0 −136 lib/Combust/Control/Basic.pm
  49. +0 −150 lib/Combust/Control/Bitcard.pm
  50. +0 −28 lib/Combust/Control/Bitcard/RDBO.pm
  51. +0 −60 lib/Combust/Control/Mason.pm
  52. +0 −117 lib/Combust/Control/Redirect.pm
  53. +0 −20 lib/Combust/Control/StaticFiles.pm
  54. +0 −13 lib/Combust/Control/Trans.pm
  55. +0 −232 lib/Combust/Cookies.pm
  56. +0 −83 lib/Combust/DB.pm
  57. +0 −54 lib/Combust/Debug.pm
  58. +0 −17 lib/Combust/Gearman.pm
  59. +0 −15 lib/Combust/Gearman/Client.pm
  60. +0 −16 lib/Combust/Gearman/Worker.pm
  61. +0 −137 lib/Combust/JSON.pm
  62. +0 −76 lib/Combust/JSON/Object.pm
  63. +0 −426 lib/Combust/Logger.pm
  64. +0 −26 lib/Combust/Middleware.pm
  65. +0 −80 lib/Combust/Notes.pm
  66. +0 −13 lib/Combust/Redirect.pm
  67. +0 −69 lib/Combust/Request.pm
  68. +0 −32 lib/Combust/Request/Apache.pm
  69. +0 −104 lib/Combust/Request/Apache13.pm
  70. +0 −117 lib/Combust/Request/Apache2.pm
  71. +0 −47 lib/Combust/Request/CGI.pm
  72. +0 −131 lib/Combust/Request/Plack.pm
  73. +0 −23 lib/Combust/Request/URI.pm
  74. +0 −229 lib/Combust/RoseDB.pm
  75. +0 −400 lib/Combust/RoseDB/Column/Point.pm
  76. +0 −11 lib/Combust/RoseDB/Constants.pm
  77. +0 −28 lib/Combust/RoseDB/ConventionManager.pm
  78. +0 −38 lib/Combust/RoseDB/JsonFields.pm
  79. +0 −22 lib/Combust/RoseDB/Manager.pm
  80. +0 −88 lib/Combust/RoseDB/Metadata.pm
  81. +0 −52 lib/Combust/RoseDB/Object.pm
  82. +0 −71 lib/Combust/RoseDB/Object/toJson.pm
  83. +0 −52 lib/Combust/RoseDB/Scaffold.pm
  84. +0 −19 lib/Combust/RoseDB/Transaction.pm
  85. +0 −12 lib/Combust/Router.pm
  86. +0 −95 lib/Combust/Secret.pm
  87. +0 −40 lib/Combust/Site.pm
  88. +0 −186 lib/Combust/StaticFiles.pm
  89. +0 −168 lib/Combust/Template.pm
  90. +0 −27 lib/Combust/Template/Filters.pm
  91. +0 −82 lib/Combust/Template/Plugin/CacheLWPSimple.pm
  92. +0 −73 lib/Combust/Template/Plugin/JavaScript.pm
  93. +0 −48 lib/Combust/Template/Plugin/Rotato.pm
  94. +0 −127 lib/Combust/Template/Provider.pm
  95. +0 −250 lib/Combust/Template/ProviderSVN.pm
  96. +0 −79 lib/Combust/Template/Translator/POD.pm
  97. +0 −30 lib/Combust/Util.pm
  98. +0 −62 lib/Combust/t/Logger.t
  99. +0 −11 misc/Bundle-Combust/Changes
  100. +0 −7 misc/Bundle-Combust/MANIFEST
  101. +0 −15 misc/Bundle-Combust/Makefile.PL
  102. +0 −10 misc/Bundle-Combust/README
  103. +0 −106 misc/Bundle-Combust/lib/Bundle/Combust.pm
  104. +0 −154 misc/Bundle-Combust/lib/Bundle/Combust/Extras.pm
  105. +0 −2 services/httpd/.gitignore
  106. +0 −1 services/httpd/log/.gitignore
  107. +0 −2 services/httpd/log/run
  108. +0 −20 services/httpd/run
  109. +0 −39 sql/combust.update
  110. +0 −9 t/CombustTest/API.pm
  111. +0 −19 t/CombustTest/API/Test.pm
  112. +0 −6 t/Constant.t
  113. +0 −77 t/Cookies.t
  114. +0 −29 t/Secret.t
  115. +0 −16 t/Site.t
  116. +0 −9 t/Template.t
  117. +0 −32 t/api.t
  118. +0 −1 t/app/trivial/.gitignore
  119. +0 −13 t/app/trivial/README
  120. +0 −31 t/app/trivial/apache/sites/one.tmpl
  121. +0 −6 t/app/trivial/app.psgi
  122. +0 −31 t/app/trivial/basic.t
  123. +0 −12 t/app/trivial/combust.conf
  124. +0 −2 t/app/trivial/docs/live/.htredirects
  125. +0 −1 t/app/trivial/docs/live/index.html
  126. +0 −2 t/app/trivial/docs/live/one
  127. +0 −1 t/app/trivial/docs/live/three
  128. +0 −1 t/app/trivial/docs/live/three.html
  129. +0 −3 t/app/trivial/docs/live/two
  130. +0 −9 t/app/trivial/lib/Trivial/App.pm
  131. +0 −6 t/app/trivial/lib/Trivial/Control.pm
  132. +0 −18 t/app/trivial/lib/Trivial/Control/One.pm
  133. +0 −17 t/app/trivial/lib/Trivial/Control/Two.pm
  134. +0 −146 t/cache.t
  135. +0 −8 t/config/10.conf
  136. +0 −25 t/config/10.t
  137. +0 −7 t/config/20.conf
  138. +0 −20 t/config/20.t
  139. +0 −12 t/config/30.conf
  140. +0 −20 t/config/30.t
  141. +0 −11 t/config/40.conf
  142. +0 −18 t/config/40alias.t
  143. +0 −7 t/config/50.conf
  144. +0 −16 t/config/50.t
  145. +0 −7 t/config/51.conf
  146. +0 −18 t/config/51.t
  147. +0 −14 t/config/52-sites.conf
  148. +0 −17 t/config/52-sites.t
  149. +0 −6 t/db/db.conf
  150. +0 −30 t/db/db.t
  151. +0 −96 t/json.t
  152. +0 −31 t/request_plack.t
View
@@ -1,5 +1,5 @@
- Copyright 2003-2008 Ask Bj�rn Hansen, Develooper LLC
+ Copyright 2003-2011 Ask Bj�rn Hansen, Develooper LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
View
@@ -1,25 +0,0 @@
-# Upgrade notes from Apache to Plack version
-
-* Should use "use Moose; extends 'Combust::Control';" instead of just
- "use base 'Combust::Control'"
-
-* The Apache configuration template gets a 'plack' variable set to
- true when the configuration is built for plack.
-
-* request->cookie for "plain" cookies is deprecated; use
- request->(response->)cookies instead (see Plack::Response for details).
-
-* request->uri now returns a URI object with some extra code to have
- it emulate the old behavior of just returning the path when
- stringified.
-
-* There's no more Combust::Control::Error module
-
-* proxyip_forwarders are not "chained"; only the most recent header is
-read. Plack::Middleware::ReverseProxy would have to be changed to fix
-that.
-
-* When using proxyip_forwarders, X-Forwarded-Server, X-Forwarded-Host,
-X-Forwarded-Port, X-Forwarded-HTTPS and X-Forwarded-Proto headers are
-also supported.
-
View
61 TODO
@@ -1,61 +0,0 @@
-
-In rough order of priority
-==========================
-
---- old stuff below ---
-
-Make tests using the database skip_all if it can't connect to the test db
-
-Make tests using the database setup the basic shema automatically
-
-Sort out where mime.types is being found. Is what it says in the
-sample configuration right? What is apache_config used for anyway?
-
-Make sure If-Modified-Since requests are working
-
-None of the internal methods should require $r to be passed
-
-Make the cookie validation code not be hardcoded in Combust::Cookie
-(!) (maybe make a Combust::Ticket type thing?)
-
-Make an API to access the notes...
-
-Make Combust::Control::Basic only do the transhandler rather than
-serving the file too if it's not going to be processed by template
-toolkit.
-
-Read the subversion revision or some "combust-release" file at startup time
-
-/combust-status
-
-think of a way to allow non-text/html content types
-
-Add the include_root and combust revision to the Etag. If it wasn't
-so expensive we could add docs revision as well. Hmn. Maybe not useful.
-
-Make the controller set the INCLUDE_PATH depending on the vhost (or document root?)
- - maybe use a separate configuration file so it's easy to specify
- pulling from svn or from a directory
- - possibly configured per branch?
-
-
-Cache full html outputs? Use master svn revision in the cache key. Or
-maybe use svn revision for perl.org/backend/ combined with svn
-revision for perl.org/docs/[site]/. (are we providing enough options
-for this now?)
-
-Set Last-Updated properly. (did we do this?)
-
-Handle If-Modified-Since requests.
-
-
-
-Notes
------
-
-Magic menus / breadcrumbs:
- http://lists.template-toolkit.org/pipermail/templates/2002-December/004049.html
- http://lists.template-toolkit.org/pipermail/templates/2002-December/004046.html
- http://lists.template-toolkit.org/pipermail/templates/2002-December/004047.html
-
-
View
@@ -1,232 +0,0 @@
-#!/bin/sh
-#
-# Apache control script designed to allow an easy command line interface
-# to controlling Apache. Written by Marc Slemko, 1997/08/23
-#
-# The exit codes returned are:
-# 0 - operation completed successfully
-# 1 -
-# 2 - usage error
-# 3 - httpd could not be started
-# 4 - httpd could not be stopped
-# 5 - httpd could not be started during a restart
-# 6 - httpd could not be restarted during a restart
-# 7 - httpd could not be restarted during a graceful restart
-# 8 - configuration syntax error
-#
-# When multiple arguments are given, only the error from the _last_
-# one is reported. Run "apachectl help" for usage info
-#
-#
-# |||||||||||||||||||| START CONFIGURATION SECTION ||||||||||||||||||||
-# -------------------- --------------------
-#
-# the path to your PID file
-ROOT=${CBROOTLOCAL:-$CBROOT}
-LOG_PATH=`$CBROOT/bin/perl -MCombust::Config -e 'print Combust::Config->new->log_path'`
-WORK_PATH=`$CBROOT/bin/perl -MCombust::Config -e 'print Combust::Config->new->work_path'`
-PIDFILE=$LOG_PATH/httpd.pid
-#
-# the path to your httpd binary, including options if necessary
-HTTPD="$CBROOT/bin/httpd -d $ROOT/apache -f $WORK_PATH/httpd.conf"
-#
-# a command that outputs a formatted text version of the HTML at the
-# url given on the command line. Designed for lynx, however other
-# programs may work.
-LYNX="lynx -dump"
-#
-# the URL to your server's mod_status status page. If you do not
-# have one, then status and fullstatus will not work.
-STATUSURL="http://localhost:8222/server-status"
-#
-# -------------------- --------------------
-# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
-
-ERROR=0
-ARGV="$@"
-if [ "x$ARGV" = "x" ] ; then
- ARGS="help"
-fi
-
-for ARG in $@ $ARGS
-do
- # check for pidfile
- if [ -f $PIDFILE ] ; then
- PID=`cat $PIDFILE`
- if [ "x$PID" != "x" ] && kill -0 $PID 2>/dev/null ; then
- STATUS="httpd (pid $PID) running"
- RUNNING=1
- else
- STATUS="httpd (pid $PID?) not running"
- RUNNING=0
- fi
- else
- STATUS="httpd (no pid file) not running"
- RUNNING=0
- fi
-
- case $ARG in
- start)
- if [ $RUNNING -eq 1 ]; then
- echo "$0 $ARG: httpd (pid $PID) already running"
- continue
- fi
- if $HTTPD ; then
- echo "$0 $ARG: httpd started"
- else
- echo "$0 $ARG: httpd could not be started"
- ERROR=3
- fi
- ;;
- stop)
- if [ $RUNNING -eq 0 ]; then
- echo "$0 $ARG: $STATUS"
- continue
- fi
- if kill $PID ; then
- echo "$0 $ARG: httpd stopped"
- else
- echo "$0 $ARG: httpd could not be stopped"
- ERROR=4
- fi
- ;;
- restart)
- if [ $RUNNING -eq 0 ]; then
- echo "$0 $ARG: httpd not running, trying to start"
- if $HTTPD ; then
- echo "$0 $ARG: httpd started"
- else
- echo "$0 $ARG: httpd could not be started"
- ERROR=5
- fi
- else
- if $HTTPD -t >/dev/null 2>&1; then
- if kill -HUP $PID ; then
- echo "$0 $ARG: httpd restarted"
- else
- echo "$0 $ARG: httpd could not be restarted"
- ERROR=6
- fi
- else
- echo "$0 $ARG: configuration broken, ignoring restart"
- echo "$0 $ARG: (run 'apachectl configtest' for details)"
- ERROR=6
- fi
- fi
- ;;
- graceful)
- if [ $RUNNING -eq 0 ]; then
- echo "$0 $ARG: httpd not running, trying to start"
- if $HTTPD ; then
- echo "$0 $ARG: httpd started"
- else
- echo "$0 $ARG: httpd could not be started"
- ERROR=5
- fi
- else
- if $HTTPD -t >/dev/null 2>&1; then
- if kill -USR1 $PID ; then
- echo "$0 $ARG: httpd gracefully restarted"
- else
- echo "$0 $ARG: httpd could not be restarted"
- ERROR=7
- fi
- else
- echo "$0 $ARG: configuration broken, ignoring restart"
- echo "$0 $ARG: (run 'apachectl configtest' for details)"
- ERROR=7
- fi
- fi
- ;;
- status)
- $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } '
- ;;
- fullstatus)
- $LYNX $STATUSURL
- ;;
- configtest)
- if $HTTPD -t; then
- :
- else
- ERROR=8
- fi
- ;;
- *)
- echo "usage: $0 (start|stop|restart|fullstatus|status|graceful|configtest|help)"
- cat <<EOF
-
-start - start httpd
-stop - stop httpd
-restart - restart httpd if running by sending a SIGHUP or start if
- not running
-fullstatus - dump a full status screen; requires lynx and mod_status enabled
-status - dump a short status screen; requires lynx and mod_status enabled
-graceful - do a graceful restart by sending a SIGUSR1 or start if not running
-configtest - do a configuration syntax test
-help - this screen
-
-EOF
- ERROR=2
- ;;
-
- esac
-
-done
-
-exit $ERROR
-
-# ====================================================================
-# Copyright (c) 1995-1999 The Apache Group. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. All advertising materials mentioning features or use of this
-# software must display the following acknowledgment:
-# "This product includes software developed by the Apache Group
-# for use in the Apache HTTP server project (http://www.apache.org/)."
-#
-# 4. The names "Apache Server" and "Apache Group" must not be used to
-# endorse or promote products derived from this software without
-# prior written permission. For written permission, please contact
-# apache@apache.org.
-#
-# 5. Products derived from this software may not be called "Apache"
-# nor may "Apache" appear in their names without prior written
-# permission of the Apache Group.
-#
-# 6. Redistributions of any form whatsoever must retain the following
-# acknowledgment:
-# "This product includes software developed by the Apache Group
-# for use in the Apache HTTP server project (http://www.apache.org/)."
-#
-# THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
-# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
-# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-# OF THE POSSIBILITY OF SUCH DAMAGE.
-# ====================================================================
-#
-# This software consists of voluntary contributions made by many
-# individuals on behalf of the Apache Group and was originally based
-# on public domain software written at the National Center for
-# Supercomputing Applications, University of Illinois, Urbana-Champaign.
-# For more information on the Apache Group and the Apache HTTP server
-# project, please see <http://www.apache.org/>.
-#
View
@@ -1,65 +0,0 @@
-[% # -*- apache -*- %]
-[% dont_edit # add warning; do edit *THIS* file.. ;-) %]
-
-PidFile "[% config.log_path %]/httpd.pid"
-
-KeepAlive [% config.keepalive %]
-KeepAliveTimeout [% config.keepalivetimeout %]
-StartServers [% config.startservers %]
-MaxClients [% config.maxclients %]
-MaxRequestsPerChild [% config.maxrequestsperchild %]
-Listen [% config.port %]
-
-TypesConfig [% root %]/apache/conf/mime.types
-
-AddOutputFilterByType DEFLATE text/html text/plain text/xml
-AddOutputFilterByType DEFLATE text/javascript text/css
-AddOutputFilterByType DEFLATE application/xhtml+xml application/rss+xml
-
-PerlRequire [% root %]/apache/conf/startup.pl
-
-LogLevel [% config.apache_loglevel %]
-
-LogFormat "%h %V %u %t %{site}n \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %V %u %t \"%r\" %>s %b" common
-
-PerlPostReadRequestHandler ProxyIP
-
-ErrorDocument 404 /error/404.html
-ErrorDocument 500 /error/500.html
-
-NameVirtualHost *:[% config.port %]
-
-# Default first host (so an unconfigured vhost doesn't fall back to one of the following
-<VirtualHost *:[% config.port %]>
- ServerName combust-default
- DocumentRoot [% root %]/apache/root_templates/default_site/
-
- <Location />
- SetHandler perl-script
- PerlSetVar UseDocumentRoot 1
- PerlResponseHandler Combust::Control::Basic->super
- </Location>
-
-</VirtualHost>
-
-# FIXME|TODO: make the site variable be set by a transhandler;
-# likewise dispatch to /error/ - that way most site configurations can
-# be merged into one virtualhost block - maybe.
-
-[% MACRO expandServerAliases( aliasList ) BLOCK %]
- [%- FOREACH v = aliasList.list %][%- IF v -%]
- ServerAlias [% v %]
- [% END -%][%- END -%]
-[% END %]
-
-[% FOREACH site = config.sites_list %]
- # [% site %]
-[% IF config.site.$site.servername;
- PROCESS "sites/${site}.tmpl";
- ELSE %]
- # ServerName for [% site %] not configured in combust.conf!
-[% END;
- END %]
-
-
Oops, something went wrong.

0 comments on commit e80edd9

Please sign in to comment.