redmine_with_git 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cd6d0b32f7a3e275e123bf8fe1f0ea70ae28b4e6a1583b9e62aa0fc9f178801
-  data.tar.gz: a56eec38d46b777e9c146fe6cd6e7fec559c04c0352eeaf4e0b735693ff9f380
+  metadata.gz: 4da1581067c611d753b0d5777c7d7c279a8de40429cd073edbf57d90c33a6bc3
+  data.tar.gz: f3a7c684b5523358df1bb3463cd6f5463f8ba8785096ce4f31fd529a987f8f87
 SHA512:
-  metadata.gz: c7646e3272b6ef8101cdbaee0251fbb23fe438cb7259ccdabf1ccf7b138065aaf3c2b4688e8b024cd755c363e8f044fdae256df8490c11bb6504a3df6983852e
-  data.tar.gz: 52a64883cd6eaf2bab3da4cba96021e66984ef3cb84681dfdb0cd2b785397df968924c7d961cd5944527c44da75b21c005a29416261567dadd406e2706232fd0
+  metadata.gz: cbe45833d410521bed85e0056e0792e8f85d9db81ca88b7c9f7a1aaf81bdc5b1ead649bb597e50fadfcd66446f8d942afa4f19d18dcfd939fde1b80f98a04aa7
+  data.tar.gz: 7f229c4e39f7e7f6f959521f02fc810bad4dbe5f38a2239e969b840a82069808dbfe8dd78183c3c84cf73988289ab97bb97197f06993f7d21fee3b903a569f69

data/installer/default_settings.sh

@@ -0,0 +1,47 @@
+# Auxilary functions
+function sanitize_boolean_var {
+  if [ "$1" != 'false' -a "$1" != 'true' ]; then
+    if [ -n "$1" ]; then
+      echo 'true'
+    else
+      echo 'false'
+    fi
+  else
+    echo "$1"
+  fi
+}
+
+function set_by_boolean {
+  local value="${!1}"
+  if [ "$(sanitize_boolean_var "$value")" == 'true' ]; then
+    export $2=$3
+  else
+    export $2=$4
+  fi
+}
+
+# Default settings
+export address_https=false
+export address_host=localhost
+export address_port=
+set_by_boolean address_https address_scheme https http
+export address_server="$address_host"
+if [ -n "$address_port" ]; then
+  export address_server="$address_server:$address_port"
+fi
+export git_repositories_hierarchical_organisation=true
+set_by_boolean git_repositories_hierarchical_organisation git_repositories_unique_repo_identifier \
+  false true
+export gitolite_user=git
+export gitolite_user_home=/var/lib/git
+export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
+
+# Auxiliary settings
+export REDMINE_WITH_GIT_INSTALL_ROOT="$(dirname "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )")"
+export REDMINE_WITH_GIT_TEMPLATE_ROOT="${REDMINE_WITH_GIT_INSTALL_ROOT}/installer/template"
+
+# Redmine configuration
+if [ ! -v 'REDMINE_CONFIGURATION_EXTRA' ]; then
+  export REDMINE_CONFIGURATION_EXTRA=''
+fi
+export REDMINE_CONFIGURATION_EXTRA+="  scm_xiolite_command: /usr/bin/git"

data/installer/tasks/_before_run.sh

@@ -1,51 +1,3 @@
-# Auxilary functions
-function sanitize_boolean_var {
-  if [ "$1" != 'false' -a "$1" != 'true' ]; then
-    if [ -n "$1" ]; then
-      echo 'true'
-    else
-      echo 'false'
-    fi
-  else
-    echo "$1"
-  fi
-}
-
-function set_by_boolean {
-  local value="${!1}"
-  if [ "$(sanitize_boolean_var "$value")" == 'true' ]; then
-    export $2=$3
-  else
-    export $2=$4
-  fi
-}
-
-# Default settings
-export address_https=false
-export address_host=localhost
-export address_port=
-set_by_boolean address_https address_scheme https http
-export address_server="$address_host"
-if [ -n "$address_port" ]; then
-  export address_server="$address_server:$address_port"
-fi
-export git_repositories_hierarchical_organisation=true
-set_by_boolean git_repositories_hierarchical_organisation git_repositories_unique_repo_identifier \
-  false true
-export gitolite_user=git
-export gitolite_user_home=/var/lib/git
-export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
-
-# Auxiliary settings
-export REDMINE_WITH_GIT_INSTALL_ROOT="$(dirname "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )")"
-export REDMINE_WITH_GIT_TEMPLATE_ROOT="${REDMINE_WITH_GIT_INSTALL_ROOT}/template"
-
 # Task dependencies
 taskeiro_add_dependency redmine_bundle redmine_with_git_bundle_requirements
 taskeiro_add_dependency development redmine_git_hosting
-
-# Redmine configuration
-if [ ! -v 'REDMINE_CONFIGURATION_EXTRA' ]; then
-  export REDMINE_CONFIGURATION_EXTRA=''
-fi
-REDMINE_CONFIGURATION_EXTRA+="  scm_xiolite_command: /usr/bin/git\n"

data/installer/tasks/gitolite_rc.sh

@@ -10,7 +10,7 @@ function gitolite_rc_template {
 }
 
 function task_dependencies {
-  echo gitolite_setup
+  echo gitolite_user_home
 }
 
 function task_condition {

data/installer/tasks/gitolite_setup.sh

@@ -4,7 +4,7 @@ set -u
 set -e
 
 function task_dependencies {
-  echo gitolite_user_home gitolite redmine_git_hosting_ssh_key
+  echo gitolite_rc gitolite redmine_git_hosting_ssh_key
 }
 
 function task_condition {

data/lib/redmine_with_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RedmineWithGit
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_with_git
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2019-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-tools
@@ -78,6 +78,7 @@ files:
 - config/locales/pt-BR.yml
 - config/routes.rb
 - init.rb
+- installer/default_settings.sh
 - installer/programs/linux/sudo_file_exists.sh
 - installer/programs/rails/user.sh
 - installer/programs/redmine/installer/triggers/list/redmine_git_hosting_rescue.sh