All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 27118862 authored by Mike Hibler's avatar Mike Hibler

Assorted fixes to Utah versions of httpd.conf files.

parent 65cf4658
...@@ -194,7 +194,8 @@ LoadModule cache_module libexec/apache22/mod_cache.so ...@@ -194,7 +194,8 @@ LoadModule cache_module libexec/apache22/mod_cache.so
LoadModule suexec_module libexec/apache22/mod_suexec.so LoadModule suexec_module libexec/apache22/mod_suexec.so
#LoadModule disk_cache_module libexec/apache22/mod_disk_cache.so #LoadModule disk_cache_module libexec/apache22/mod_disk_cache.so
#LoadModule file_cache_module libexec/apache22/mod_file_cache.so #LoadModule file_cache_module libexec/apache22/mod_file_cache.so
LoadModule mem_cache_module libexec/apache22/mod_mem_cache.so #LoadModule mem_cache_module libexec/apache22/mod_mem_cache.so
LoadModule memcache_module libexec/apache22/mod_memcache.so
LoadModule cgi_module libexec/apache22/mod_cgi.so LoadModule cgi_module libexec/apache22/mod_cgi.so
# #
...@@ -748,6 +749,15 @@ RedirectMatch ^/mailman[/]*$ http://@USERNODE@/mailman/listinfo ...@@ -748,6 +749,15 @@ RedirectMatch ^/mailman[/]*$ http://@USERNODE@/mailman/listinfo
ScriptAlias /cvsweb/ "/usr/testbed/www/cvsweb/" ScriptAlias /cvsweb/ "/usr/testbed/www/cvsweb/"
Alias /jabber/ "/usr/testbed/www/jabber/" Alias /jabber/ "/usr/testbed/www/jabber/"
ScriptAlias /spewrpmtar /usr/testbed/cgi-bin/spewrpmtar_cgi
<Directory "/usr/testbed/cgi-bin">
Options FollowSymLinks
AllowOverride None
Order allow,deny
Allow from all
</Directory>
# #
# Redirect allows you to tell clients about documents which used to exist in # Redirect allows you to tell clients about documents which used to exist in
# your server's namespace, but do not anymore. This allows you to tell the # your server's namespace, but do not anymore. This allows you to tell the
...@@ -1202,7 +1212,7 @@ SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW ...@@ -1202,7 +1212,7 @@ SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW
# pass phrase. Note that a kill -HUP will prompt again. A new # pass phrase. Note that a kill -HUP will prompt again. A new
# certificate can be generated using the genkey(1) command. # certificate can be generated using the genkey(1) command.
#SSLCertificateFile /etc/pki/tls/certs/localhost.crt #SSLCertificateFile /etc/pki/tls/certs/localhost.crt
SSLCertificateFile /etc/httpd/ssl.crt/@USERNODE@.crt SSLCertificateFile /usr/local/etc/apache22/ssl.crt/@USERNODE@.crt
# Server Private Key: # Server Private Key:
# If the key is not combined with the certificate, use this # If the key is not combined with the certificate, use this
...@@ -1210,7 +1220,7 @@ SSLCertificateFile /etc/httpd/ssl.crt/@USERNODE@.crt ...@@ -1210,7 +1220,7 @@ SSLCertificateFile /etc/httpd/ssl.crt/@USERNODE@.crt
# you've both a RSA and a DSA private key you can configure # you've both a RSA and a DSA private key you can configure
# both in parallel (to also allow the use of DSA ciphers, etc.) # both in parallel (to also allow the use of DSA ciphers, etc.)
#SSLCertificateKeyFile /etc/pki/tls/private/localhost.key #SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
SSLCertificateKeyFile /etc/httpd/ssl.key/@USERNODE@.key SSLCertificateKeyFile /usr/local/etc/apache22/ssl.key/@USERNODE@.key
# Server Certificate Chain: # Server Certificate Chain:
# Point SSLCertificateChainFile at a file containing the # Point SSLCertificateChainFile at a file containing the
......
...@@ -394,7 +394,7 @@ DocumentRoot "@prefix@/www/" ...@@ -394,7 +394,7 @@ DocumentRoot "@prefix@/www/"
AllowOverride All AllowOverride All
</Directory> </Directory>
<Directory @prefix/@www/dev> <Directory @prefix@/www/dev>
# Allow .htaccess files in dev trees # Allow .htaccess files in dev trees
AllowOverride All AllowOverride All
Order deny,allow Order deny,allow
...@@ -1321,7 +1321,7 @@ SSLRequire ( %{SSL_CLIENT_S_DN_OU} ne "sslxmlrpc" ) ...@@ -1321,7 +1321,7 @@ SSLRequire ( %{SSL_CLIENT_S_DN_OU} ne "sslxmlrpc" )
ScriptAlias /protogeni/xmlrpc @prefix@/protogeni/xmlrpc/protogeni-wrapper.pl ScriptAlias /protogeni/xmlrpc @prefix@/protogeni/xmlrpc/protogeni-wrapper.pl
ScriptAlias /protogeni/stoller/xmlrpc @prefix@/devel/stoller/protogeni/xmlrpc/protogeni-wrapper.pl ScriptAlias /protogeni/stoller/xmlrpc @prefix@/devel/stoller/protogeni/xmlrpc/protogeni-wrapper.pl
ScriptAlias /protogeni/gtw/xmlrpc @prefix/devel/gtw/protogeni/xmlrpc/protogeni-wrapper.pl ScriptAlias /protogeni/gtw/xmlrpc @prefix@/devel/gtw/protogeni/xmlrpc/protogeni-wrapper.pl
<Directory "@prefix@/www/protogeni"> <Directory "@prefix@/www/protogeni">
SSLRequireSSL SSLRequireSSL
...@@ -1532,7 +1532,7 @@ SSLRequire ( %{SSL_CLIENT_S_DN_OU} ne "sslxmlrpc" ) ...@@ -1532,7 +1532,7 @@ SSLRequire ( %{SSL_CLIENT_S_DN_OU} ne "sslxmlrpc" )
ScriptAlias /protogeni/xmlrpc @prefix@/protogeni/xmlrpc/protogeni-wrapper.pl ScriptAlias /protogeni/xmlrpc @prefix@/protogeni/xmlrpc/protogeni-wrapper.pl
ScriptAlias /protogeni/stoller/xmlrpc @prefix@/devel/stoller/protogeni/xmlrpc/protogeni-wrapper.pl ScriptAlias /protogeni/stoller/xmlrpc @prefix@/devel/stoller/protogeni/xmlrpc/protogeni-wrapper.pl
ScriptAlias /protogeni/gtw/xmlrpc @prefix/devel/gtw/protogeni/xmlrpc/protogeni-wrapper.pl ScriptAlias /protogeni/gtw/xmlrpc @prefix@/devel/gtw/protogeni/xmlrpc/protogeni-wrapper.pl
<Directory "@prefix@/www/protogeni"> <Directory "@prefix@/www/protogeni">
SSLRequireSSL SSLRequireSSL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment