Fix patch macros

[ihttpd] / SOURCES / ihttpd.conf

diff --git a/SOURCES/ihttpd.conf b/SOURCES/ihttpd.conf
index 02a62b2205b0121746f881df038315ab38ebb48a..38f0c01c36cd979e0e19fcceca282ef41fedc573 100644 (file)
--- a/SOURCES/ihttpd.conf
+++ b/SOURCES/ihttpd.conf
@@ -6,6 +6,9 @@ ServerRoot "/etc"
 Listen 80
 Listen 443
 
 Listen 80
 Listen 443
 

+# Server name
+ServerName localhost
+

 # Server admin
 ServerAdmin root@localhost
 
 # Server admin
 ServerAdmin root@localhost
 


@@ -19,6 +22,9 @@ AddDefaultCharset UTF-8
 # Allow file send
 EnableSendfile on
 
 # Allow file send
 EnableSendfile on
 

+# Set timeout
+Timeout 600
+

 # Set document root
 DocumentRoot "/var/www/html"
 
 # Set document root
 DocumentRoot "/var/www/html"
 


@@ -56,17 +62,30 @@ SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5
 SSLSessionCache shmcb:/run/ihttpd/ssl_scache(512000)
 SSLProtocol all -SSLv3
 
 SSLSessionCache shmcb:/run/ihttpd/ssl_scache(512000)
 SSLProtocol all -SSLv3
 

-# Redirect to https
+# Enable rewrite

 RewriteEngine On
 RewriteEngine On

+
+# Redirect to https

 RewriteCond %{HTTPS} !=on
 RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
 
 RewriteCond %{HTTPS} !=on
 RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
 

+# Redirect unexisting documents to script
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule .* /index.bin [L]
+

 # SSL vhost
 <VirtualHost *:443>
 # SSL vhost
 <VirtualHost *:443>

-       ServerName localhost
+       # Enable ssl

        SSLEngine on
        SSLCertificateFile /etc/pki/tls/certs/ihttpd.pem
        SSLCertificateKeyFile /etc/pki/tls/private/ihttpd.pem
        SSLEngine on
        SSLCertificateFile /etc/pki/tls/certs/ihttpd.pem
        SSLCertificateKeyFile /etc/pki/tls/private/ihttpd.pem

+
+       # Inherit rewrite config
+       RewriteEngine On
+       RewriteOptions Inherit
+
+       # Set custom log

        CustomLog "/run/ihttpd/log/https.log" "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 </VirtualHost>
 
        CustomLog "/run/ihttpd/log/https.log" "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 </VirtualHost>