diff --git a/src/ozones/Server/etc/ozones-server.conf b/src/ozones/Server/etc/ozones-server.conf index c59c7efddc..4d4e79aeaa 100644 --- a/src/ozones/Server/etc/ozones-server.conf +++ b/src/ozones/Server/etc/ozones-server.conf @@ -24,7 +24,7 @@ :databasetype: sqlite #:htaccess: /var/www/.htaccess -:dbdebug: yes +:dbdebug: no ##################### # Server Configuration diff --git a/src/ozones/Server/lib/OZones/ApacheWritter.rb b/src/ozones/Server/lib/OZones/ApacheWritter.rb index 68678889a3..b33e9088e2 100644 --- a/src/ozones/Server/lib/OZones/ApacheWritter.rb +++ b/src/ozones/Server/lib/OZones/ApacheWritter.rb @@ -19,6 +19,11 @@ module OZones class ApacheWritter def initialize(file_path) @file_path = file_path + + File.open(@file_path, 'w') {|f| + f.flock(File::LOCK_EX) + f.write(htaccess) + } end def update diff --git a/src/ozones/Server/lib/OZones/ProxyRules.rb b/src/ozones/Server/lib/OZones/ProxyRules.rb index 1d38cef9a3..cabae51c66 100644 --- a/src/ozones/Server/lib/OZones/ProxyRules.rb +++ b/src/ozones/Server/lib/OZones/ProxyRules.rb @@ -23,11 +23,16 @@ module OZones @file_path = file_path else if !ENV["ONE_LOCATION"] - @file_path="/usr/lib/one/ozones/htaccess" + @file_path="/var/lib/one/.htaccess" else - @file_path=ENV["ONE_LOCATION"]+"/lib/ozones/htaccess" + @file_path=ENV["ONE_LOCATION"]+"/var/.htaccess" end end + + # Let's check for file permissions + if !File.writable?(File.dirname(@file_path)) + raise "#{@file_path} is not writable" + end end def update diff --git a/src/ozones/Server/ozones-server.rb b/src/ozones/Server/ozones-server.rb index c3b19612b5..afb31e9f50 100755 --- a/src/ozones/Server/ozones-server.rb +++ b/src/ozones/Server/ozones-server.rb @@ -97,6 +97,13 @@ end ADMIN_NAME = @auth.name ADMIN_PASS = @auth.password +begin + OZones::ProxyRules.new("apache",config[:htaccess]) +rescue Exception => e + warn e.message + exit -1 +end + ############################################################################## # Sinatra Configuration