From: Ben Shum <bshum@biblio.org>
Date: Sat, 13 Sep 2014 22:07:47 +0000 (-0400)
Subject: LP#1369169: Remove trailing whitespace from apache2.conf
X-Git-Tag: osrf_rel_2_5_0-alpha~62
X-Git-Url: http://git.equinoxoli.org/?p=opensrf-equinox.git;a=commitdiff_plain;h=5f56ccb01c551046bc85d0e755db320ac1987cb3

LP#1369169: Remove trailing whitespace from apache2.conf

For some reason, there was a lot of trailing whitespace in this apache2.conf
file for websockets. Removing them.

Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/examples/apache2/websockets/apache2.conf b/examples/apache2/websockets/apache2.conf
index 0aaca73..b04f3d7 100644
--- a/examples/apache2/websockets/apache2.conf
+++ b/examples/apache2/websockets/apache2.conf
@@ -1,5 +1,5 @@
 # This is the main Apache server configuration file for the OpenSRF
-# WebSockets gateway.  
+# WebSockets gateway.
 
 # if we don't want to run as "opensrf", change the LockFile
 LockFile ${APACHE_LOCK_DIR}/accept.lock
@@ -43,31 +43,31 @@ LogFormat "%{User-agent}i" agent
 
 # WebSockets via SSL
 Listen 7682
-NameVirtualHost *:7682                                                          
-<VirtualHost *:7682>                                                            
-    DocumentRoot /var/www                                                       
-    ServerName localhost:7682                                                   
-    ServerAlias 127.0.0.1:7682                                                  
-    SSLEngine on                                                                
-    SSLHonorCipherOrder On                                                      
+NameVirtualHost *:7682
+<VirtualHost *:7682>
+    DocumentRoot /var/www
+    ServerName localhost:7682
+    ServerAlias 127.0.0.1:7682
+    SSLEngine on
+    SSLHonorCipherOrder On
     SSLCipherSuite ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM
 
     # re-use the certs from the main apache instance
     SSLCertificateFile /etc/apache2/ssl/server.crt
     SSLCertificateKeyFile /etc/apache2/ssl/server.key
-</VirtualHost>                                                                  
-                                                                                
+</VirtualHost>
+
 # WebSockets via non-SSL
 Listen 7680
-NameVirtualHost *:7680                                                          
-<VirtualHost *:7680>                                                            
-    ServerName localhost:7680                                                   
-    ServerAlias 127.0.0.1:7680                                                  
-    DocumentRoot /var/www                                                       
-</VirtualHost>                                                                  
+NameVirtualHost *:7680
+<VirtualHost *:7680>
+    ServerName localhost:7680
+    ServerAlias 127.0.0.1:7680
+    DocumentRoot /var/www
+</VirtualHost>
                                                                                 
 # OpenSRF WebSockets gateway
-<Location /osrf-websocket-translator>                                           
-    SetHandler websocket-handler                                                
+<Location /osrf-websocket-translator>
+    SetHandler websocket-handler
     WebSocketHandler /usr/lib/apache2/modules/osrf_websocket_translator.so osrf_websocket_init
-</Location> 
+</Location>