diff --git a/CHANGELOG b/CHANGELOG index 328a589..e9a18fc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ ====================== Version Description +1.0.38......Always pre-configure bastille.conf on new installs. 1.0.37......Add initial support for IPv6 and VNET. 1.0.36......Remove obsolete code, update config. 1.0.35......Use bastille built-in convert function. diff --git a/bastille-init b/bastille-init index e53aace..ce2c670 100755 --- a/bastille-init +++ b/bastille-init @@ -323,18 +323,18 @@ sys_symlinkdir() fi # Link bastile config file. - if [ -f "${INSTALLPATH}/${USRLOCAL}/etc/${APPNAME}/${APPNAME}.conf.sample" ]; then - cd ${INSTALLPATH}/${USRLOCAL}/etc/${APPNAME} - if [ ! -f "${APPNAME}.conf" ]; then - cp ${APPNAME}.conf.sample ${APPNAME}.conf - fi - else + #if [ -f "${INSTALLPATH}/${USRLOCAL}/etc/${APPNAME}/${APPNAME}.conf.sample" ]; then + # cd ${INSTALLPATH}/${USRLOCAL}/etc/${APPNAME} + # if [ ! -f "${APPNAME}.conf" ]; then + # cp ${APPNAME}.conf.sample ${APPNAME}.conf + # fi + #else if [ -f "${BASTILLECONF_EXT}" ]; then if [ ! -f "${INSTALLPATH}/${USRLOCAL}/etc/${APPNAME}/${APPNAME}.conf" ]; then cp ${BASTILLECONF_EXT} ${INSTALLPATH}/${USRLOCAL}/etc/${APPNAME}/${APPNAME}.conf fi fi - fi + #fi # Copy bastille shared. if [ -d "${INSTALLPATH}/${USRLOCAL}/share/${APPNAME}" ]; then diff --git a/version b/version index f6c5328..9600efd 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.37 +1.0.38