Resolve "Put default config to /etc/eos-docker/defult"

Closes #33 (closed)

projects/eos/utils/eos-docker

@@ -9,6 +9,7 @@ export ED_DOCKER_IMAGE_NAME_VERSION=${ED_DOCKER_IMAGE_NAME_VERSION-"eos-prod:4.2
 export ED_ROOT_DIR=${ED_ROOT_DIR-"/root/eos"}
 export ED_BACKUP_DIR=${ED_BACKUP_DIR-"$HOME/eos_backup"}
 export ED_EOS_VAR_DIR=${ED_EOS_VAR_DIR-"$ED_ROOT_DIR/var"}
+export ED_CONFIG_FILE_DEFAULT=${ED_CONFIG_FILE_DEFAULT-"/etc/eos-docker/eos-docker.cf.default"}
 export ED_CONFIG_FILE=${ED_CONFIG_FILE-"eos-docker.cf"}
 export ED_FST_HOSTS=${ED_FST_HOSTS-"eos-docker-fst.cf"}
 
@@ -34,56 +35,56 @@ function version() {
 function eosDockerGenerateConfig() {
   [ -d $ED_ROOT_DIR ] || mkdir -p $ED_ROOT_DIR
 
-cat > $ED_ROOT_DIR/$ED_CONFIG_FILE.default << EOF
-#!/bin/bash
-# EOS docker generated config $(date)
+# cat > $ED_ROOT_DIR/$ED_CONFIG_FILE.default << EOF
+# #!/bin/bash
+# # EOS docker generated config $(date)
 
-export ED_NODE_TYPE="mgm"
+# export ED_NODE_TYPE="mgm"
 
-export ED_ROOT_DIR="$ED_ROOT_DIR"
-export ED_EOS_VAR_DIR="$ED_ROOT_DIR/var"
-export ED_CONFIG_FILE="$ED_CONFIG_FILE"
-export ED_DOCKER_PREFIX="$ED_DOCKER_PREFIX"
-export ED_DOCKER_IMAGE_NAME_VERSION="$ED_DOCKER_IMAGE_NAME_VERSION"
+# export ED_ROOT_DIR="$ED_ROOT_DIR"
+# export ED_EOS_VAR_DIR="$ED_ROOT_DIR/var"
+# export ED_CONFIG_FILE="$ED_CONFIG_FILE"
+# export ED_DOCKER_PREFIX="$ED_DOCKER_PREFIX"
+# export ED_DOCKER_IMAGE_NAME_VERSION="$ED_DOCKER_IMAGE_NAME_VERSION"
 
-export ED_FST_DATA_PREFIX="/var/eos/fs"
-export ED_EOS_MAX_NUM_FS="36"
-export ED_EOS_FS_HEADROOM="5G"
+# export ED_FST_DATA_PREFIX="/var/eos/fs"
+# export ED_EOS_MAX_NUM_FS="36"
+# export ED_EOS_FS_HEADROOM="5G"
 
-export ED_EOS_INSTANCE_NAME="test"
+# export ED_EOS_INSTANCE_NAME="test"
 
-export EOS_MGM_HOST="$(hostname -f)"
-export EOS_MGM_HOST_TARGET="$(hostname -f)"
-export EOS_MGM_MASTER1="$(hostname -f)"
-export EOS_MGM_MASTER2="$(hostname -f)"
-export EOS_MGM_ALIAS="$(hostname -f)"
-export EOS_GEOTAG="test"
-export EOS_MGM_URL="root://$(hostname -f)"
-
-# Enable krb5
-#export ED_MGM_KRB5="OPENBRAIN.SK"
-
-# Enable ldap useri info on MGM (user mapping)
-export ED_MGM_LDAP=0
-#export ED_MGM_LDAP_SERVER="ldap://ipa1-iep-grid.saske.sk"
-#export ED_MGM_LDAP_BASE="cn=accounts,dc=openbrain,dc=sk"
-
-# Enable monitoring
-export ED_MONITORING=1
-
-export ED_LOGGER_THEME=light"
-#export ED_LOGGER_THEME=dark"
-
-#################################
-# Experts only                  #
-#################################
-# Following arguments are appended to 'docker create' command.
-# Note: One needs to do 'eos-docker [mgm|mgmfst] update' to apply these changes
-#export ED_DOCKER_ARGS_BEGIN="--net=host"
-export ED_DOCKER_ARGS_BEGIN="--privileged --net=host"
-export ED_DOCKER_ARGS_END=""
+# export EOS_MGM_HOST="$(hostname -f)"
+# export EOS_MGM_HOST_TARGET="$(hostname -f)"
+# export EOS_MGM_MASTER1="$(hostname -f)"
+# export EOS_MGM_MASTER2="$(hostname -f)"
+# export EOS_MGM_ALIAS="$(hostname -f)"
+# export EOS_GEOTAG="test"
+# export EOS_MGM_URL="root://$(hostname -f)"
 
-EOF
+# # Enable krb5
+# #export ED_MGM_KRB5="OPENBRAIN.SK"
+
+# # Enable ldap useri info on MGM (user mapping)
+# export ED_MGM_LDAP=0
+# #export ED_MGM_LDAP_SERVER="ldap://ipa1-iep-grid.saske.sk"
+# #export ED_MGM_LDAP_BASE="cn=accounts,dc=openbrain,dc=sk"
+
+# # Enable monitoring
+# export ED_MONITORING=1
+
+# export ED_LOGGER_THEME=light"
+# #export ED_LOGGER_THEME=dark"
+
+# #################################
+# # Experts only                  #
+# #################################
+# # Following arguments are appended to 'docker create' command.
+# # Note: One needs to do 'eos-docker [mgm|mgmfst] update' to apply these changes
+# #export ED_DOCKER_ARGS_BEGIN="--net=host"
+# export ED_DOCKER_ARGS_BEGIN="--privileged --net=host"
+# export ED_DOCKER_ARGS_END=""
+
+# EOF
 
 cat > $ED_ROOT_DIR/$ED_CONFIG_FILE.simple << EOF
 #!/bin/bash
@@ -596,7 +597,12 @@ function eosDockerCheckEnv() {
 [ -n $(alias | grep eos-mgm) ] || source /etc/profile.d/eos-docker-env.sh
 
 if [ -f $ED_ROOT_DIR/$ED_CONFIG_FILE ];then
-  source $ED_ROOT_DIR/$ED_CONFIG_FILE.default
+  if [ -f $ED_CONFIG_FILE_DEFAULT ];then
+    [ -f $ED_ROOT_DIR/$ED_CONFIG_FILE.default ] && { echo "Warning : File '$ED_ROOT_DIR/$ED_CONFIG_FILE.default' is decrypted on MGM. Please remove it !!!"}
+    source $ED_CONFIG_FILE_DEFAULT
+  else
+    source $ED_ROOT_DIR/$ED_CONFIG_FILE.default
+  fi
   source $ED_ROOT_DIR/$ED_CONFIG_FILE
   eosDockerInitLogger