head	1.10;
access;
symbols
	TIGRIS_1_1_0RC2:1.8.6.1
	TIGRIS_1_1_0RC1:1.8.6.1
	TIGRIS_1_1:1.8.6.1.0.2
	TIGRIS_1_0_8:1.8.6.1
	TIGRIS_1_0_8RC3:1.8.6.1
	TIGRIS_1_0_8RC2:1.8
	TIGRIS_1_0_8RC1:1.8
	TIGRIS_1_0_7:1.8
	TIGRIS_1_0_7RC3:1.8
	TIGRIS_1_0_7RC2:1.8
	TIGRIS_1_0_7RC1:1.8
	TIGRIS_1_0_6:1.8
	TIGRIS_1_0_6RC5:1.8
	TIGRIS_1_0_6RC4:1.8
	TIGRIS_1_0_6RC3:1.8
	TIGRIS_1_0_6RC2:1.8
	TIGRIS_1_0_6RC1:1.8
	TIGRIS_1_0_5:1.8
	TIGRIS_1_0_5RC6:1.8
	TIGRIS_1_0_5RC5:1.8
	TIGRIS_1_0_5RC4:1.8
	TIGRIS_1_0_5RC3:1.8
	TIGRIS_1_0_5RC2:1.8
	TIGRIS_1_0_5RC1:1.8
	TIGRIS_1_0_4:1.8
	TIGRIS_1_0_3:1.8
	TIGRIS_1_0_2:1.8
	TIGRIS_1_0_1:1.8
	TIGRIS_1_0:1.8.0.6
	TIGRIS_1_0_0:1.8
	TIGRIS_1_0_0_RC1:1.8.0.2
	dlr:1.1.1
	TIGRIS_0_9_2_4:1.6.2.3
	TIGRIS_0_9_2_3:1.6.2.2
	HELM_PEER_PORT_BRANCH:1.1.1.2
	TURBINE_PEER:1.6
	TIGRIS_0_9_2_1:1.6
	TIGRIS_0_9_2:1.6.0.2
	TIGRIS_0_9_0:1.5.0.2
	TIGRIS_0_8_4:1.4.0.2
	NEWHELM:1.1.1.1
	TIGRIS_NOV_12_2000:1.1.1
	OLDHELM:1.2.0.4
	TIGRIS_NOV_11_2000:1.2
	TIGRIS_SEP_13_2000:1.2.0.2
	TIGRIS_BASELINE:1.2;
locks; strict;
comment	@# @;


1.10
date	2001.08.08.23.07.47;	author ms;	state Exp;
branches;
next	1.9;

1.9
date	2001.03.31.04.36.18;	author edk;	state Exp;
branches;
next	1.8;

1.8
date	2001.01.30.03.34.38;	author stack;	state Exp;
branches
	1.8.6.1;
next	1.7;

1.7
date	2001.01.30.03.34.09;	author stack;	state Exp;
branches;
next	1.6;

1.6
date	2001.01.11.03.13.58;	author dlr;	state Exp;
branches
	1.6.2.1
	1.6.4.1;
next	1.5;

1.5
date	2000.12.12.05.29.39;	author jrobbins;	state Exp;
branches;
next	1.4;

1.4
date	2000.11.29.12.38.18;	author jrobbins;	state Exp;
branches;
next	1.3;

1.3
date	2000.11.12.22.57.30;	author dlr;	state Exp;
branches;
next	1.2;

1.2
date	2000.08.24.21.50.42;	author ed;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2000.08.23.17.25.08;	author ed;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2000.11.12.21.13.47;	author dlr;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2001.02.21.00.28.06;	author dlr;	state Exp;
branches;
next	;

1.2.2.1
date	2000.11.12.22.34.54;	author jrobbins;	state Exp;
branches;
next	1.2.2.2;

1.2.2.2
date	2000.12.12.05.36.50;	author jrobbins;	state Exp;
branches;
next	;

1.6.2.1
date	2001.01.30.02.49.45;	author stack;	state Exp;
branches;
next	1.6.2.2;

1.6.2.2
date	2001.01.30.03.12.15;	author stack;	state Exp;
branches;
next	1.6.2.3;

1.6.2.3
date	2001.02.01.20.39.38;	author jrobbins;	state Exp;
branches;
next	;

1.6.4.1
date	2001.02.17.22.12.06;	author leonardr;	state Exp;
branches;
next	;

1.8.6.1
date	2001.07.13.21.18.37;	author ms;	state Exp;
branches;
next	;


desc
@@


1.10
log
@stop the server from trying to execute (luckily it would previously fail) .cgi scripts uploaded
@
text
@# NPM: added for setting up default/main virtual host, which which is the
# first virtual host listed. This is according to my experience w/ apache
# when running with "Include /home/httpd/tigris/apache/tigris.conf"; this
# file includes the webmodules.conf file which in turn
# defines the virtual hosts. For whatever reason, the first "project"
# defined in tigris becomes the default virtual host which always matches
# the called server hostname.  Thus, we setup a first virtual host, before
# including tigris.conf in order to make this "OUR" default host's response
# to URL's not matching any project. This is relevant to implementing a
# main-page area for the whole farm of projects being maintained by the
# tigris server, e.g. www.e-speak.net or www.tigris.org. If you don't do 
# this, then your tigris customers first project to get setup becomes the 
# default host. This existing behavior is probably a bug, not a feature.


# Reinstituting a BASIC_AUTH that is switched off the
# IF_GATED env.sh variable for the special case of instantiations
# w/ guest/anon-login that need the site protected prelaunch. 
#
# Lines with IF_GATED are commented out based on an environment
# variable passed to configure.pl.  Uses these lines for gated communities.
# The way it works is that in env.sh, you define IF_GATED as either
# the empty string or as the httpd.conf comment character, '#'.
#
__IF_GATED__ # CONFIG - set to Auth_MySQL_Info localhost <username> <password>
__IF_GATED__ Auth_MySQL_Info __DATABASE_HOST__ __DATABASE_USER__ __DATABASE_PASSWORD__
__IF_GATED__ # CONFIG - set to Auth_MySQL_General_DB <database-name>

__IF_GATED__ Auth_MySQL_General_DB __DATABASE_NAME__

__IF_GATED__ <Location />
__IF_GATED__ Auth_MySQL_Password_Table HELM_USER
__IF_GATED__ Auth_MySQL_Username_Field LOGIN_NAME
__IF_GATED__ Auth_MySQL_Password_Field PASSWORD
__IF_GATED__ Auth_MySQL_Encryption_Types MySQL
__IF_GATED__ Auth_MySQL on
__IF_GATED__ AuthName Sourcecast
__IF_GATED__ AuthType Basic

## for preview sites with only one workable password
# __IF_GATED__ require user collab

## for basic auth dialog for all users
 __IF_GATED__ require valid-user

__IF_GATED__ </Location>



# CONFIG - set these to /path/to/tigris/perl/cgi
Alias /tigriscgi __SANDBOX__/helm/perl/cgi
Alias /local-cgi __SANDBOX__/helm/perl/cgi
<Location /tigriscgi>
AddHandler cgi-script cgi
Options ExecCGI
AllowOverride none
Order deny,allow
Deny from all
Allow from 127.0.0.1
#satisfy any
</Location>

<Location /local-cgi>
AddHandler cgi-script cgi
Options ExecCGI
AllowOverride none
Order deny,allow
Deny from all
Allow from 127.0.0.1
#satisfy any
</Location>


Alias /local-access-only __SANDBOX__/data/helm/htdoc
<Location /local-access-only>
AddHandler cgi-script cgi
Options ExecCGI
AllowOverride none
Order deny,allow
Deny from all
Allow from 127.0.0.1
#satisfy any
</Location>
@


1.9
log
@update the sections which are used when IF_GATED is turned on --
the column names were wrong
@
text
@a48 1
AddHandler cgi-script cgi
d54 1
d64 1
d76 1
@


1.8
log
@Removed duplicate line
@
text
@d32 3
a34 3
__IF_GATED__ Auth_MySQL_Password_Table User
__IF_GATED__ Auth_MySQL_Username_Field loginID
__IF_GATED__ Auth_MySQL_Password_Field password
@


1.8.6.1
log
@added new key, HTTPD_HOME and integrated with conf files that would use the value
@
text
@d3 1
a3 1
# when running with "Include __HTTPD_HOME__/tigris/apache/tigris.conf"; this
@


1.7
log
@Reinstituting the IF_GATED facility.  There are scenarios where it is needed.  For instance, a site allows guest login but while still in development you do not want public traffic till after launch
@
text
@a26 1
__IF_GATED__ Auth_MySQL_Info __DATABASE_HOST__ __DATABASE_USER__ __DATABASE_PASSWORD__
@


1.6
log
@IF_GATED is deprecated.
@
text
@d16 34
@


1.6.4.1
log
@Ported head changes to branch.
@
text
@a15 33
# Reinstituting a BASIC_AUTH that is switched off the
# IF_GATED env.sh variable for the special case of instantiations
# w/ guest/anon-login that need the site protected prelaunch. 
#
# Lines with IF_GATED are commented out based on an environment
# variable passed to configure.pl.  Uses these lines for gated communities.
# The way it works is that in env.sh, you define IF_GATED as either
# the empty string or as the httpd.conf comment character, '#'.
#
__IF_GATED__ # CONFIG - set to Auth_MySQL_Info localhost <username> <password>
__IF_GATED__ Auth_MySQL_Info __DATABASE_HOST__ __DATABASE_USER__ __DATABASE_PASSWORD__
__IF_GATED__ # CONFIG - set to Auth_MySQL_General_DB <database-name>

__IF_GATED__ Auth_MySQL_General_DB __DATABASE_NAME__

__IF_GATED__ <Location />
__IF_GATED__ Auth_MySQL_Password_Table User
__IF_GATED__ Auth_MySQL_Username_Field loginID
__IF_GATED__ Auth_MySQL_Password_Field password
__IF_GATED__ Auth_MySQL_Encryption_Types MySQL
__IF_GATED__ Auth_MySQL on
__IF_GATED__ AuthName Sourcecast
__IF_GATED__ AuthType Basic

## for preview sites with only one workable password
# __IF_GATED__ require user collab

## for basic auth dialog for all users
 __IF_GATED__ require valid-user

__IF_GATED__ </Location>


@


1.6.2.1
log
@Adding back the IF_GATED basic auth facility
@
text
@a15 34

# Reinstituting a BASIC_AUTH that is switched off the
# IF_GATED env.sh variable for the special case of instantiations
# w/ guest/anon-login that need the site protected prelaunch. 
#
# Lines with IF_GATED are commented out based on an environment
# variable passed to configure.pl.  Uses these lines for gated communities.
# The way it works is that in env.sh, you define IF_GATED as either
# the empty string or as the httpd.conf comment character, '#'.
#
__IF_GATED__ # CONFIG - set to Auth_MySQL_Info localhost <username> <password>
__IF_GATED__ Auth_MySQL_Info __DATABASE_HOST__ __DATABASE_USER__
__DATABASE_PASSWORD__
__IF_GATED__ # CONFIG - set to Auth_MySQL_General_DB <database-name>

__IF_GATED__ Auth_MySQL_General_DB __DATABASE_NAME__

__IF_GATED__ <Location />
__IF_GATED__ Auth_MySQL_Password_Table User
__IF_GATED__ Auth_MySQL_Username_Field loginID
__IF_GATED__ Auth_MySQL_Password_Field password
__IF_GATED__ Auth_MySQL_Encryption_Types MySQL
__IF_GATED__ Auth_MySQL on
__IF_GATED__ AuthName Tigris
__IF_GATED__ AuthType Basic

## for preview sites with only one workable password
# __IF_GATED__ require user collab

## for basic auth dialog for all users
 __IF_GATED__ require valid-user

__IF_GATED__ </Location>

@


1.6.2.2
log
@Add getting password from env.sh set environment
@
text
@d27 2
a28 1
__IF_GATED__ Auth_MySQL_Info __DATABASE_HOST__ __DATABASE_USER__ __DATABASE_PASSWORD__
@


1.6.2.3
log
@moved over changes from head
@
text
@d16 1
d38 1
a38 1
__IF_GATED__ AuthName Sourcecast
a47 1

@


1.5
log
@made it so that dialog will say domain name instead of "tigris"
@
text
@a15 26
# Lines with IF_GATED are commented out based on an environment
# variable passed to configure.pl
# Uses these lines for gated communities

__IF_GATED__ # CONFIG - set to Auth_MySQL_Info localhost <username> <password>
__IF_GATED__ Auth_MySQL_Info __DATABASE_HOST__ __DATABASE_USER__ __DATABASE_PASSWORD__
__IF_GATED__ # CONFIG - set to Auth_MySQL_General_DB <database-name>
__IF_GATED__ Auth_MySQL_General_DB __DATABASE_NAME__

__IF_GATED__ <Location />
__IF_GATED__ Auth_MySQL_Password_Table User
__IF_GATED__ Auth_MySQL_Username_Field loginID
__IF_GATED__ Auth_MySQL_Password_Field password
__IF_GATED__ Auth_MySQL_Encryption_Types MySQL
__IF_GATED__ Auth_MySQL on
__IF_GATED__ AuthName __DOMAIN__
__IF_GATED__ AuthType Basic

## for preview sites with only one workable password
__IF_GATED__ require user collab

## for basic auth dialog for all users
# __IF_GATED__ require valid-user

__IF_GATED__ </Location>

@


1.4
log
@added ContentHelmNoodle and all of its associated files, also had to add a hook for ProxyModule to transform page name and support for alternative master templates
@
text
@d31 1
a31 1
__IF_GATED__ AuthName Tigris
@


1.3
log
@Resolved merge conflicts.
@
text
@d66 9
a74 1

@


1.2
log
@add a Location section for local-cgi (really, either this should
be a Directory section or local-cgi should be removed from the java
code ...)
@
text
@d26 2
a27 2
__IF_GATED__ Auth_MySQL_Password_Table domain_users
__IF_GATED__ Auth_MySQL_Username_Field username
d33 7
a39 1
__IF_GATED__ require valid-user
@


1.2.2.1
log
@added warning about satisfy any
@
text
@a35 5

# IMPORTANT NOTE: when you use IF_GATED (w/ value not a comment symbol) then
# you must uncomment "satisfy any" in two places below


@


1.2.2.2
log
@made it so that dialog will say domain name instead of "tigris"
@
text
@d31 1
a31 1
__IF_GATED__ AuthName __DOMAIN__
@


1.1
log
@big changes as part of the conf file rationalization.   everything in
data/helm/apache is obsolete now (so ApacheConfig is unneeded, though
it hasn't been removed yet).  the apache conf files are now installed in
a new location, and they are fairly different: instead of vhosts,
we use rewritecond to support dynamic virtual hosts.   the file in
helm/perl/cgi/local was moved up to helm/perl/cgi
@
text
@d50 8
@


1.1.1.1
log
@Merging newhelm tree into helm, as per IZ issue #557.  Previous major version of helm is tagged TIGRIS_NOV_11_2000.
@
text
@d26 2
a27 2
__IF_GATED__ Auth_MySQL_Password_Table User
__IF_GATED__ Auth_MySQL_Username_Field loginID
d33 1
a33 7

## for preview sites with only one workable password
__IF_GATED__ require user collab

## for basic auth dialog for all users
# __IF_GATED__ require valid-user

a49 8
<Location /local-cgi>
Options ExecCGI
AllowOverride none
Order deny,allow
Deny from all
Allow from 127.0.0.1
#satisfy any
</Location>
@


1.1.1.2
log
@Replacing the HEAD with the HELM_PEER_PORT_BRANCH.
@
text
@a15 4
# Reinstituting a BASIC_AUTH that is switched off the
# IF_GATED env.sh variable for the special case of instantiations
# w/ guest/anon-login that need the site protected prelaunch. 
#
d17 3
a19 4
# variable passed to configure.pl.  Uses these lines for gated communities.
# The way it works is that in env.sh, you define IF_GATED as either
# the empty string or as the httpd.conf comment character, '#'.
#
a22 1

d31 1
a31 1
__IF_GATED__ AuthName Sourcecast
d35 1
a35 1
# __IF_GATED__ require user collab
d38 1
a38 1
 __IF_GATED__ require valid-user
a41 1

d66 1
a66 9
Alias /local-access-only __SANDBOX__/data/helm/htdoc
<Location /local-access-only>
Options ExecCGI
AllowOverride none
Order deny,allow
Deny from all
Allow from 127.0.0.1
#satisfy any
</Location>
@


