[Groonga-commit] droonga/droonga-engine at 926f126 [master] Reset file permission for the base directory

Zurück zum Archiv-Index

YUKI Hiroshi null+****@clear*****
Wed Sep 24 18:51:07 JST 2014


YUKI Hiroshi	2014-09-24 18:51:07 +0900 (Wed, 24 Sep 2014)

  New Revision: 926f1267904875ef1ebd80739633d9954da3e83f
  https://github.com/droonga/droonga-engine/commit/926f1267904875ef1ebd80739633d9954da3e83f

  Message:
    Reset file permission for the base directory

  Modified files:
    bin/droonga-engine-configure
    lib/droonga/service_installation.rb

  Modified: bin/droonga-engine-configure (+4 -2)
===================================================================
--- bin/droonga-engine-configure    2014-09-24 18:47:03 +0900 (0864be0)
+++ bin/droonga-engine-configure    2014-09-24 18:51:07 +0900 (da6da06)
@@ -223,7 +223,6 @@ if options[:reset_config]
   end
   Droonga::SafeFileWriter.write(Droonga::Path.config,
                                 YAML.dump(new_configuration))
-  service_installation.ensure_correct_file_permission(Droonga::Path.config)
 end
 
 if options[:reset_catalog]
@@ -232,7 +231,10 @@ if options[:reset_catalog]
          "--hosts",  host,
          "--port",   port.to_s,
          "--tag",    tag)
-  service_installation.ensure_correct_file_permission(Droonga::Path.catalog)
+end
+
+if options[:reset_config] or options[:reset_catalog]
+  service_installation.ensure_correct_file_permission(Droonga::Path.base)
 end
 
 if running

  Modified: lib/droonga/service_installation.rb (+1 -1)
===================================================================
--- lib/droonga/service_installation.rb    2014-09-24 18:47:03 +0900 (4b94200)
+++ lib/droonga/service_installation.rb    2014-09-24 18:51:07 +0900 (eaa47b9)
@@ -88,7 +88,7 @@ module Droonga
 
     def ensure_correct_file_permission(file)
       if user_exist?
-        FileUtils.chown(user_name, group_name, file)
+        FileUtils.chown_R(user_name, group_name, file)
       end
     end
 
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Zurück zum Archiv-Index