Masato Taruishi
taru****@users*****
2005年 5月 23日 (月) 11:28:37 JST
===================================================================
RCS file: projects/apache/apache2_ssl.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- projects/apache/apache2_ssl.in 2005/02/03 18:42:45 1.2
+++ projects/apache/apache2_ssl.in 2005/05/23 02:28:37 1.3
@@ -164,12 +164,12 @@
# mixture between C and Perl. See the mod_ssl documentation
# for more details.
#<Location />
-#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \\
-# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \\
-# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \\
-# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \\
-# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \\
-# or %{REMOTE_ADDR} =~ m/^192\\.76\\.162\\.[0-9]+$/
+#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
+# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
+# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
+# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
+# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \
+# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
#</Location>
# SSL Engine Options:
@@ -204,7 +204,7 @@
# This enables optimized SSL connection renegotiation handling when SSL
# directives are used in per-directory context.
#SSLOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire
-<Files ~ "\\.(cgi|shtml|phtml|php3?)$">
+<Files ~ "\.(cgi|shtml|phtml|php3?)$">
SSLOptions +StdEnvVars
</Files>
<Directory "/usr/lib/cgi-bin">
@@ -235,15 +235,15 @@
# Similarly, one has to force some clients to use HTTP/1.0 to workaround
# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
# "force-response-1.0" for this.
-SetEnvIf User-Agent ".*MSIE.*" \\
- nokeepalive ssl-unclean-shutdown \\
+SetEnvIf User-Agent ".*MSIE.*" \
+ nokeepalive ssl-unclean-shutdown \
downgrade-1.0 force-response-1.0
# Per-Server Logging:
# The home of a custom SSL log file. Use this when you want a
# compact non-error SSL logfile on a virtual host basis.
-CustomLog /var/log/apache2/ssl_request_log \\
- "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \\"%r\\" %b"
+CustomLog /var/log/apache2/ssl_request_log \
+ "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
</VirtualHost>
===================================================================
RCS file: projects/apache/update-apache,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- projects/apache/update-apache 2005/02/03 18:42:45 1.7
+++ projects/apache/update-apache 2005/05/23 02:28:37 1.8
@@ -34,15 +34,14 @@
return
fi
else
- if ! test -x "/usr/sbin/update-apache2-modules"; then
+ if ! test -x "/usr/sbin/a2enmod"; then
return
fi
fi
if test "x$APACHE_VHOSTS" != "x"; then
if test "x$1" = "xapache2"; then
- update-apache2-modules --add vhost_aliasa || true
- update-apache2-modules --enable vhost_alias
+ a2enmod vhost_alias
else
apache-modconf "$1" enable mod_vhost_alias
fi
@@ -51,12 +50,10 @@
test -e "$TLSCERTIFICATEFILE" &&
test -e "$TLSCERTIFICATEKEYFILE"
then
- update-apache2-modules --add ssl || true
- update-apache2-modules --enable ssl
+ a2enmod ssl
fi
if test "x$1" = "xapache2"; then
- update-apache2-modules --add auth_ldap || true
- update-apache2-modules --enable auth_ldap
+ a2enmod auth_ldap
else
apache-modconf "$1" enable auth_ldap
fi
@@ -104,9 +101,9 @@
then
/bin/cp $tmp $tmp2
$SHAREDIR/sedwrap < "$APACHE2_SSLIN" >> $tmp2
- add_endmark "##" "$id" >> $tmp
+ add_endmark "##" "$id" >> $tmp2
fi
- add_endmark "##" "$id" >> $tmp2
+ add_endmark "##" "$id" >> $tmp
for s in $APACHE_SUITES
do