Get Gitolite lib dir with gitolite query-rc command

Author: root

Diff for: app/forms/plugin_settings_validation/storage_config.rb

@@ -9,18 +9,16 @@ module StorageConfig
       add_accessor :gitolite_global_storage_dir,
                    :gitolite_redmine_storage_dir,
                    :gitolite_recycle_bin_dir,
-                   :gitolite_local_code_dir,
-                   :gitolite_lib_dir
+                   :gitolite_local_code_dir
 
       before_validation do
         self.gitolite_global_storage_dir  = strip_value(gitolite_global_storage_dir)
         self.gitolite_redmine_storage_dir = strip_value(gitolite_redmine_storage_dir)
         self.gitolite_recycle_bin_dir     = strip_value(gitolite_recycle_bin_dir)
         self.gitolite_local_code_dir      = strip_value(gitolite_local_code_dir)
-        self.gitolite_lib_dir             = strip_value(gitolite_lib_dir)
       end
 
-      validates_presence_of :gitolite_global_storage_dir, :gitolite_recycle_bin_dir, :gitolite_lib_dir
+      validates_presence_of :gitolite_global_storage_dir, :gitolite_recycle_bin_dir
       validates_presence_of :gitolite_local_code_dir, if: Proc.new { RedmineGitHosting::Config.gitolite_version == 3 }
 
       validates_each PATHS_TO_VALIDATE do |record, attr, value|

Diff for: app/views/settings/redmine_git_hosting/_gitolite_config_storage.html.haml

@@ -3,7 +3,6 @@
 - gitolite_redmine_storage_dir = RedmineGitHosting::Config.get_setting(:gitolite_redmine_storage_dir)
 - gitolite_recycle_bin_dir     = RedmineGitHosting::Config.get_setting(:gitolite_recycle_bin_dir)
 - gitolite_local_code_dir      = RedmineGitHosting::Config.get_setting(:gitolite_local_code_dir)
-- gitolite_lib_dir             = RedmineGitHosting::Config.get_setting(:gitolite_lib_dir)
 
 %h3= l(:label_gitolite_storage_config)
 
@@ -40,11 +39,3 @@
       = surround '(', ')' do
         = l(:label_gitolite_local_code_dir_desc) + ','
         = link_to 'Gitolite non-core programs', 'http://gitolite.com/gitolite/non-core.html#localcode', target: 'blank'
-
-%p
-  %label= l(:label_gitolite_lib_dir)
-  = text_field_tag 'settings[gitolite_lib_dir]', gitolite_lib_dir, size: 60
-  %br
-  %em
-    = surround '(', ')' do
-      = l(:label_gitolite_lib_dir_desc)

Diff for: app/views/settings/redmine_git_hosting/_gitolite_config_test.html.haml

@@ -20,6 +20,22 @@
     %td= l(:label_sudo_redmine_to_gitolite_user)
     %td= image_tag (RedmineGitHosting::Config.can_redmine_sudo_to_gitolite_user? ? 'true.png' : 'exclamation.png')
 
+  %tr
+    %td= l(:label_gitolite_bin_dir)
+    %td
+      - if RedmineGitHosting::Config.gitolite_bin_dir
+        %span{ class: 'label label-success' }= RedmineGitHosting::Config.gitolite_bin_dir
+      - else
+        = image_tag('exclamation.png')
+
+  %tr
+    %td= l(:label_gitolite_lib_dir)
+    %td
+      - if RedmineGitHosting::Config.gitolite_lib_dir
+        %span{ class: 'label label-success' }= RedmineGitHosting::Config.gitolite_lib_dir
+      - else
+        = image_tag('exclamation.png')
+
   - gitolite_checks = RedmineGitHosting::Config.check_hooks_install!
 
   %tr

Diff for: config/locales/settings/en.yml

@@ -28,8 +28,6 @@ en:
   label_gitolite_redmine_storage_dir_desc: Relative to Gitolite repositories base path
   label_gitolite_local_code_dir: Gitolite non-core hooks directory
   label_gitolite_local_code_dir_desc: Relative to Gitolite user home
-  label_gitolite_lib_dir: Gitolite librairies directory
-  label_gitolite_lib_dir_desc: /usr/share/gitolite3/lib under Debian, bin/lib/ if installed by hand
 
   # Gitolite Config File
   label_tab_config_file: Configuration file
@@ -170,6 +168,8 @@ en:
   label_gitolite_repository_count: Count of physical repositories in Gitolite
   label_gitolite_rugged_features: Rugged compiled features
   label_gitolite_libgit2_version: libgit2 version
+  label_gitolite_bin_dir: Gitolite binaries directory
+  label_gitolite_lib_dir: Gitolite librairies directory
 
   # Recycle Bin
   label_tab_gitolite_recycle_bin: Recycle Bin

Diff for: config/locales/settings/es.yml

@@ -28,8 +28,6 @@ es:
   label_gitolite_redmine_storage_dir_desc: Relativa al directorio de repositorios de Gitolite
   label_gitolite_local_code_dir: Carpeta de hooks non-core de Gitolite
   label_gitolite_local_code_dir_desc: Relativa al directorio del usuario de Gitolite
-  label_gitolite_lib_dir: Carpeta de bibliotecas de Gitolite
-  label_gitolite_lib_dir_desc: /usr/share/gitolite3/lib en Debian, bin/lib/ si se ha instalado a mano
 
   # Gitolite Config File
   label_tab_config_file: Fichero de configuración
@@ -169,6 +167,8 @@ es:
   label_gitolite_repository_count: Recuento de repositorios físicos en Gitolite
   label_gitolite_rugged_features: Características de Rugged compiladas
   label_gitolite_libgit2_version: Versión de libgit2
+  label_gitolite_bin_dir: Carpeta de binarios de Gitolite
+  label_gitolite_lib_dir: Carpeta de bibliotecas de Gitolite
 
   # Recycle Bin
   label_tab_gitolite_recycle_bin: Papelera de reciclaje

Diff for: config/locales/settings/fr.yml

@@ -28,8 +28,6 @@ fr:
   label_gitolite_redmine_storage_dir_desc: Relatif au répertoire personnel de l'utilisateur Gitolite
   label_gitolite_local_code_dir: Répertoire de stockage des hooks non-core
   label_gitolite_local_code_dir_desc: Relatif au répertoire personnel de l'utilisateur Gitolite
-  label_gitolite_lib_dir: Répertoire contenant les librairies Gitolite
-  label_gitolite_lib_dir_desc: /usr/share/gitolite3/lib sous Debian, bin/lib/ si installé à la main
 
   # Gitolite Config File
   label_tab_config_file: Fichier de configuration
@@ -170,6 +168,8 @@ fr:
   label_gitolite_repository_count: Nombre de dépôts physiques dans Gitolite
   label_gitolite_rugged_features: Fonctionnalités compilées dans Rugged
   label_gitolite_libgit2_version: Version de libgit2
+  label_gitolite_bin_dir: Répertoire des binaires Gitolite
+  label_gitolite_lib_dir: Répertoire des librairies Gitolite
 
   # Recycle Bin
   label_tab_gitolite_recycle_bin: Corbeille

Diff for: config/locales/settings/ru.yml

@@ -28,8 +28,6 @@ ru:
   label_gitolite_redmine_storage_dir_desc: Относительно каталога репозиториев Gitolite
   label_gitolite_local_code_dir: Каталог внешних хуков Gitolite
   label_gitolite_local_code_dir_desc: Относительно домашнего каталога пользователя Gitolite
-  label_gitolite_lib_dir: Каталог с библиотеками Gitolite
-  label_gitolite_lib_dir_desc: /usr/share/gitolite3/lib в Debian, bin/lib/ если была ручная установка
 
   # Gitolite Config File
   label_tab_config_file: Конфиг. файл
@@ -169,6 +167,8 @@ ru:
   label_gitolite_repository_count: Количество репозиториев в Gitolite
   label_gitolite_rugged_features: Rugged скомпилирован с поддержкой
   label_gitolite_libgit2_version: Версия libgit2
+  label_gitolite_bin_dir: Каталог с двоичный Gitolite
+  label_gitolite_lib_dir: Каталог с библиотеками Gitolite
 
   # Recycle Bin
   label_tab_gitolite_recycle_bin: Корзина

Diff for: lib/default_settings.yml

@@ -11,7 +11,6 @@ gitolite_global_storage_dir:    'repositories/'
 gitolite_redmine_storage_dir:   ''
 gitolite_recycle_bin_dir:       'recycle_bin/'
 gitolite_local_code_dir:        'local/'
-gitolite_lib_dir:               'bin/lib/'
 
 # Gitolite Config File
 gitolite_config_file:              'gitolite.conf'

Diff for: lib/grack/server.rb

@@ -153,7 +153,8 @@ def git_command_with_chdir
       def smart_http_args
         [
           'env',
-          "GL_LIBDIR=#{RedmineGitHosting::Config.gitolite_lib_dir_path}",
+          "GL_BINDIR=#{RedmineGitHosting::Config.gitolite_bin_dir}",
+          "GL_LIBDIR=#{RedmineGitHosting::Config.gitolite_lib_dir}",
           "GL_REPO=#{repository_object.gitolite_repository_name}",
           "GL_USER=#{@env['REMOTE_USER']}"
         ]

Diff for: lib/redmine_git_hosting/commands/gitolite.rb

@@ -15,6 +15,16 @@ def gitolite_infos
       end
 
 
+      def sudo_gitolite_query_rc(param)
+        begin
+          sudo_capture('gitolite', 'query-rc', param)
+        rescue RedmineGitHosting::Error::GitoliteCommandException => e
+          logger.error("Can't retrieve Gitolite param : #{e.output}")
+          nil
+        end
+      end
+
+
       def sudo_update_gitolite!
         if gitolite_command.nil?
           logger.error("gitolite_command is nil, can't update Gitolite !")

Diff for: lib/redmine_git_hosting/config/gitolite_base.rb

@@ -28,17 +28,13 @@ def gitolite_home_dir
       end
 
 
-      def gitolite_lib_dir
-        get_setting(:gitolite_lib_dir)
+      def gitolite_bin_dir
+        @gitolite_bin_dir ||= RedmineGitHosting::Commands.sudo_gitolite_query_rc('GL_BINDIR')
       end
 
 
-      def gitolite_lib_dir_path
-        if gitolite_lib_dir.starts_with?('/')
-          gitolite_lib_dir
-        else
-          File.join(gitolite_home_dir, gitolite_lib_dir)
-        end
+      def gitolite_lib_dir
+        @gitolite_lib_dir ||= RedmineGitHosting::Commands.sudo_gitolite_query_rc('GL_LIBDIR')
       end