fix issue #47

oehrlis · Jul 3, 2018 · 2465267 · 2465267
1 parent 1ee6906
commit 2465267
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 30 deletions.
diff --git a/local/oudbase/bin/oud_backup.sh b/local/oudbase/bin/oud_backup.sh
@@ -21,7 +21,7 @@
 # - End of Customization ------------------------------------------------
 
 # - Default Values ------------------------------------------------------
-VERSION="v1.5.1"
+VERSION="v1.5.2"
 DOAPPEND="TRUE"                                 # enable log file append
 VERBOSE="FALSE"                                 # enable verbose mode
 SCRIPT_NAME=$(basename $0)

diff --git a/local/oudbase/bin/oud_export.sh b/local/oudbase/bin/oud_export.sh
@@ -21,7 +21,7 @@
 # - End of Customization ------------------------------------------------
 
 # - Default Values ------------------------------------------------------
-VERSION="v1.5.1"
+VERSION="v1.5.2"
 DOAPPEND="TRUE"                                 # enable log file append
 VERBOSE="FALSE"                                 # enable verbose mode
 SCRIPT_NAME=$(basename $0)

diff --git a/local/oudbase/bin/oud_status.sh b/local/oudbase/bin/oud_status.sh
@@ -21,7 +21,7 @@ export OUD_ROOT_DN=${OUD_ROOT_DN:-"postgasse.org"}
 # - End of Customization ------------------------------------------------
 
 # - Default Values ------------------------------------------------------
-VERSION="v1.5.1"
+VERSION="v1.5.2"
 DOAPPEND="TRUE"                                 # enable log file append
 VERBOSE="FALSE"                                 # enable verbose mode
 SCRIPT_NAME=$(basename $0)

diff --git a/local/oudbase/bin/oudbase_install.sh b/local/oudbase/bin/oudbase_install.sh
@@ -23,7 +23,7 @@ export LOG_BASE=${LOG_BASE-"/tmp"}
 # - End of Customization ------------------------------------------------
 
 # - Default Values ------------------------------------------------------
-VERSION="v1.5.1"
+VERSION="v1.5.2"
 DOAPPEND="TRUE"                                 # enable log file append
 VERBOSE="TRUE"                                  # enable verbose mode
 SCRIPT_NAME="$(basename ${BASH_SOURCE[0]})"     # Basename of the script

diff --git a/local/oudbase/bin/oudenv.sh b/local/oudbase/bin/oudenv.sh
@@ -22,7 +22,7 @@
 # externally. In principle, these variables should not be changed at this 
 # point. The customization should be done externally in.bash_profile or 
 # in oudenv_core.conf.
-VERSION="v1.5.1"
+VERSION="v1.5.2"
 # hostname based on hostname or $HOSTNAME whatever works
 export HOST=$(hostname 2>/dev/null ||cat /etc/hostname ||echo $HOSTNAME)
 # Absolute path of script directory

diff --git a/local/oudbase/doc/.oudbase.sha b/local/oudbase/doc/.oudbase.sha
@@ -1,9 +1,9 @@
-d0cac1ab82dcbbfe683278edd71a45b15995e560  ./bin/oud_status.sh
-e4bb535eda9882096d3bf9fb368da72a34346356  ./bin/oud_export.sh
-03edb166a71042c20ef8afad60378ea937877482  ./bin/oud_backup.sh
-0cc128cdb88f35889d00d781de103cf1b2e9de19  ./bin/oudenv.sh
+119d92311151c1e46a8bf5d1793870b1d4b4afdd  ./bin/oud_status.sh
+d268f54222e64ef55ce4d1a5be207a74996e0610  ./bin/oud_export.sh
+1efbfbcbf08d6ddfc0b59df4696a3024b93d6461  ./bin/oud_backup.sh
+c93d4ef141d0d7409199ff0eafeed31c461069b3  ./bin/oudenv.sh
 eae0291c2f607231f369bdbedd2dc7bf0c318d54  ./etc/oudenv_core.conf
-c2523d153e54ce3fb855e39ad554edc1af5b35ee  ./etc/oudenv.conf
+8ac91532dc35340b3f9356cebfe75bcea53013e9  ./etc/oudenv.conf
 2ea0c0069dd86f9aaae99c274f38182c981e2113  ./etc/oudenv_custom.conf
 ef2a6ff1dfb0d3c5604cd5a4565b1358cac54137  ./etc/oudtab
 5db71a75ccbd45f85f4dbbaba286a222d2b2a760  ./etc/oud._DEFAULT_.conf
@@ -23,19 +23,19 @@ bee2da88ae85319aa1dab2a6816b83563f1627bb  ./templates/etc/oud.crontab
 b8fda5240323ee307fcff0f813ee9096270ad5aa  ./templates/logrotate.d/oudsm
 a08b4174eba98bb9861bbce2b13b7da5202fece4  ./templates/logrotate.d/oud
 061b1cf9a14f0b2e52c071bfb821b0435a747a42  ./templates/logrotate.d/oudbase
-b0345d3008638ab3ee720a901a5c6597c3fb42c6  ./templates/create/README.md
+e8427ca1c6a0cb376613cd6257e748604f4b362a  ./templates/create/README.md
 d658fd14fee25968d6c7bcd86ec76822f5b52bbe  ./templates/create/oud12c_eus/06_create_root_users.sh
 fa000a6bb12ca72d4982674fea0e3888dfe992cb  ./templates/create/oud12c_eus/04_config_oud_ad_proxy.sh
 9c126af540375c3c68b9de37961f7970de5ae867  ./templates/create/oud12c_eus/03_config_eus_realm.ldif
 b4736e585d20cb0e69038855147e4f1e393bbdfe  ./templates/create/oud12c_eus/02_config_eus_context.sh
+0c3f5bbf1d3b345e306aa459439240f6fbe9e3f4  ./templates/create/oud12c_eus/01_create_eus_instance.sh
 3a13f7a5937864bf367d0538e89d9a30a969210e  ./templates/create/oud12c_eus/02_config_eus_context.conf
 21164cb1a3321f771701008662dba5287c022a0f  ./templates/create/oud12c_eus/05_update_directory_manager.sh
 6e55313f6ba9ea7652f1dec5be8e5f0be6465694  ./templates/create/oud12c_eus/04_config_oud_ad_proxy.conf
 67582bbad01fd43163e562d48b6507987e6880e8  ./templates/create/oud12c_eus/README.md
 258d1a392bfcb506c155d28b5daea522a7cc5494  ./templates/create/oud12c_eus/07_create_eusadmin_users.sh
 c134289efbbfa0e9c8e4ea28a3ea12a705259a07  ./templates/create/oud12c_eus/06_create_root_users.ldif
 e5c7eba791b76858db3898d8771235b622c2d3f9  ./templates/create/oud12c_eus/00_init_environment
-3e00a274e99ca0a3e5263252500e6707b3c040b6  ./templates/create/oud12c_eus/01_create_eus_proxy_instance.sh
 2fda974b763d81b8a9a135eb73188a2df6ddd323  ./templates/create/oud12c_eus/03_config_eus_realm.sh
 613554bb13e73a94c1718d531b1ef14abeac530b  ./templates/create/generic/01_create_instance.sh
 79cdccf401d372f1fb3da6384dc4d8e84a4c4a4a  ./templates/create/generic/04_create_root_user.ldif
@@ -68,9 +68,9 @@ b4736e585d20cb0e69038855147e4f1e393bbdfe  ./templates/create/oud12c_eus_ad_proxy
 67582bbad01fd43163e562d48b6507987e6880e8  ./templates/create/oud12c_eus_ad_proxy/README.md
 258d1a392bfcb506c155d28b5daea522a7cc5494  ./templates/create/oud12c_eus_ad_proxy/07_create_eusadmin_users.sh
 c134289efbbfa0e9c8e4ea28a3ea12a705259a07  ./templates/create/oud12c_eus_ad_proxy/06_create_root_users.ldif
-e5c7eba791b76858db3898d8771235b622c2d3f9  ./templates/create/oud12c_eus_ad_proxy/00_init_environment
+68602ac0424c4c9f87ebfb771a1653b00b8bc383  ./templates/create/oud12c_eus_ad_proxy/00_init_environment
 3e00a274e99ca0a3e5263252500e6707b3c040b6  ./templates/create/oud12c_eus_ad_proxy/01_create_eus_proxy_instance.sh
-2fda974b763d81b8a9a135eb73188a2df6ddd323  ./templates/create/oud12c_eus_ad_proxy/03_config_eus_realm.sh
+a932ed4eab1c54db8d05024cea39fce289fee682  ./templates/create/oud12c_eus_ad_proxy/03_config_eus_realm.sh
 8624bcdae55baeef00cd11d5dfcfa60f68710a02  ./doc/LICENSE
 d5935d1391358970b173cc409c2e578adb82ed8f  ./doc/README.md
-9a25ecdc4c71c808d03594b3956c5ae252128e7c  ./doc/.version
+deec4dc7f0bcad1e422c85f6dc6bfa887b20393f  ./doc/.version
diff --git a/local/oudbase/doc/.version b/local/oudbase/doc/.version
@@ -1,6 +1,6 @@
 
-OUD Base Release v1.5.1 (https://github.com/oehrlis/oudbase)
+OUD Base Release v1.5.2 (https://github.com/oehrlis/oudbase)
 ------------------------------------------------------------
 
-The following files of oudbase are changed/added (compared to v1.5.1):
+The following files of oudbase are changed/added (compared to v1.5.2):
 ----------------------------------------------------------------------
diff --git a/local/oudbase/etc/oudenv.conf b/local/oudbase/etc/oudenv.conf
@@ -72,7 +72,7 @@ alias oudbase='cd ${OUD_BASE}'
 alias dsc='dsconfig --hostname localhost --port $PORT_ADMIN --trustAll --bindDN "cn=Directory Manager" --bindPasswordFile $PWD_FILE'
 alias dsrs='dsreplication status --adminUID admin --adminPasswordFile $ETC_BASE/pwd_rep.txt --hostname ${HOSTNAME} --port $PORT_ADMIN --trustAll'
 alias etc='cd "${ETC_BASE}"'
-alias get_pid='oud_pgrep org.opends.server|grep -i $OUD_INSTANCE |cut -d' ' -f1'
+alias get_pid='oud_pgrep org.opends.server|grep -i $OUD_INSTANCE |cut -d\' \' -f1'
 alias goh='get_oracle_home'
 alias gp='get_ports'
 alias gen_pwd='gen_password'

diff --git a/...ud12c_eus/01_create_eus_proxy_instance.sh → ...eate/oud12c_eus/01_create_eus_instance.sh b/...ud12c_eus/01_create_eus_proxy_instance.sh → ...eate/oud12c_eus/01_create_eus_instance.sh
@@ -8,7 +8,7 @@
 # Editor.....: Stefan Oehrli
 # Date.......: 2018.03.18
 # Revision...: --
-# Purpose....: Script to create the OUD proxy instance with EUS context 
+# Purpose....: Script to create the OUD instance with EUS context 
 #              using oud-proxy-setup.
 # Notes......: Will skip oud-proxy-setup if config.ldif already exists
 # Reference..: https://github.com/oehrlis/oudbase
@@ -35,18 +35,21 @@ echo "BASEDN            : ${BASEDN}"
 # check if OUD instance config does not yet exists
 if [ ! -f "${OUD_INSTANCE_HOME}/OUD/config/config.ldif" ]; then
     echo "INFO: Create OUD proxy instance ${OUD_INSTANCE}"
-    ${ORACLE_HOME}/oud/oud-proxy-setup \
+    ${ORACLE_HOME}/oud/oud-setup \
         --cli \
         --instancePath "${OUD_INSTANCE_HOME}/OUD" \
         --rootUserDN "${DIRMAN}" \
         --rootUserPasswordFile "${PWD_FILE}" \
-        --hostname ${HOST} \
+        --adminConnectorPort ${PORT_ADMIN} \
         --ldapPort ${PORT} \
         --ldapsPort ${PORT_SSL} \
-        --adminConnectorPort ${PORT_ADMIN} \
-        --enableStartTLS \
         --generateSelfSignedCertificate \
-        --eusContext ${BASEDN} \
+        --enableStartTLS \
+        --hostname ${HOST} \
+        --baseDN "${BASEDN}" \
+        --integration EUS \
+        --serverTuning jvm-default \
+        --offlineToolsTuning autotune \
         --no-prompt \
         --noPropertiesFile
 else

diff --git a/local/oudbase/templates/create/oud12c_eus_ad_proxy/00_init_environment b/local/oudbase/templates/create/oud12c_eus_ad_proxy/00_init_environment
@@ -42,13 +42,12 @@
 # - Instance information
 export DIRMAN="cn=Directory Manager"
 export REPMAN=admin
-export BASEDN="dc=postgasse,dc=org"
-export EUSCONTEXT=TRUE
+export BASEDN="dc=example,dc=comorg"
 
 # group OU below base DN in active directory eg ou=groups,dc=postgasse,dc=org
-export GROUP_OU="ou=groups"
+export GROUP_OU="ou=Groups,dc=example,dc=com"
 # user OU below base DN in active directory eg ou=people,dc=postgasse,dc=org
-export USER_OU="ou=people"
+export USER_OU="ou=People,dc=example,dc=com"
 
 # - AD integration information
 # set the host name of your primary domain controller (PDC)

diff --git a/local/oudbase/templates/create/oud12c_eus_ad_proxy/03_config_eus_realm.sh b/local/oudbase/templates/create/oud12c_eus_ad_proxy/03_config_eus_realm.sh
@@ -32,8 +32,8 @@ echo "  LDIFFILE          : ${LDIFFILE}"
 if [[ "$BASEDN" != "dc=example,dc=com" ]]; then
   echo "  Different base DN than default ."
   echo "  Update LDIF files to match $BASEDN" 
-  sed -i "s/ou=groups,dc=example,dc=com/$GROUP_OU/" ${LDIFFILE}
-  sed -i "s/ou=people,dc=example,dc=com/$USER_OU/" ${LDIFFILE}
+  sed -i "s/ou=Groups,dc=example,dc=com/$GROUP_OU/" ${LDIFFILE}
+  sed -i "s/ou=People,dc=example,dc=com/$USER_OU/" ${LDIFFILE}
   sed -i "s/dc=example,dc=com/$BASEDN/" ${LDIFFILE}
 fi