makedirs (interchange-5.8.2) | : | makedirs (interchange-5.10.0) | ||
---|---|---|---|---|
skipping to change at line 33 | skipping to change at line 33 | |||
DMODE=2770 | DMODE=2770 | |||
FMODE=660 | FMODE=660 | |||
else | else | |||
DMODE=700 | DMODE=700 | |||
FMODE=600 | FMODE=600 | |||
fi | fi | |||
# Link the image directory always | # Link the image directory always | |||
ln -s __MVC_IMAGEDIR__ __MVC_RELOCATE____MVC_CATROOT__ | ln -s __MVC_IMAGEDIR__ __MVC_RELOCATE____MVC_CATROOT__ | |||
# Link the server directory to 'i' | ||||
ln -s __MVC_RELOCATE____MVC_VENDROOT__ __MVC_RELOCATE____MVC_CATROOT__/i | ||||
# Make run directory to store run files. | ||||
if test -n '__MVC_RUNDIR__' | ||||
then | ||||
RUNDIR='__MVC_RUNDIR__' | ||||
mkdir -p __MVC_RELOCATE__$RUNDIR | ||||
if test -n "$CATUSER" | ||||
then | ||||
[ -n "$CATUSER" ] && chown $CATUSER __MVC_RELOCATE__$RUNDIR | ||||
[ -n "$CATGROUP" ] && chgrp $CATGROUP __MVC_RELOCATE__$RUNDIR | ||||
fi | ||||
chmod $DMODE __MVC_RELOCATE__$RUNDIR | ||||
else | ||||
RUNDIR='__MVC_CATROOT__/run' | ||||
mkdir -p __MVC_RELOCATE__$RUNDIR | ||||
if test -n "$CATUSER" | ||||
then | ||||
[ -n "$CATUSER" ] && chown $CATUSER __MVC_RELOCATE__$RUNDIR | ||||
[ -n "$CATGROUP" ] && chgrp $CATGROUP __MVC_RELOCATE__$RUNDIR | ||||
fi | ||||
chmod $DMODE __MVC_RELOCATE__$RUNDIR | ||||
fi | ||||
# Make log directories to store logs. | # Make log directories to store logs. | |||
if test -n '__MVC_LOGDIR__' | if test -n '__MVC_LOGDIR__' | |||
then | then | |||
LOGDIR='__MVC_LOGDIR__' | LOGDIR='__MVC_LOGDIR__' | |||
mkdir -p __MVC_RELOCATE__$LOGDIR/logs | mkdir -p __MVC_RELOCATE__$LOGDIR/logs | |||
mkdir -p __MVC_RELOCATE__$LOGDIR/orders | mkdir -p __MVC_RELOCATE__$LOGDIR/orders | |||
touch __MVC_RELOCATE__$LOGDIR/error.log | touch __MVC_RELOCATE__$LOGDIR/logs/error.log | |||
ln -s $LOGDIR/error.log __MVC_RELOCATE____MVC_CATROOT__ | ln -s $LOGDIR/error.log __MVC_RELOCATE____MVC_CATROOT__ | |||
ln -s $LOGDIR/logs __MVC_RELOCATE____MVC_CATROOT__ | ln -s $LOGDIR/logs __MVC_RELOCATE____MVC_CATROOT__ | |||
ln -s $LOGDIR/orders __MVC_RELOCATE____MVC_CATROOT__ | ln -s $LOGDIR/orders __MVC_RELOCATE____MVC_CATROOT__ | |||
chmod $DMODE __MVC_RELOCATE__$LOGDIR/logs | chmod $DMODE __MVC_RELOCATE__$LOGDIR/logs | |||
chmod $DMODE __MVC_RELOCATE__$LOGDIR/orders | chmod $DMODE __MVC_RELOCATE__$LOGDIR/orders | |||
touch __MVC_RELOCATE__$LOGDIR/error.log | touch __MVC_RELOCATE__$LOGDIR/logs/error.log | |||
if test -n "$CATUSER" | if test -n "$CATUSER" | |||
then | then | |||
[ -n "$CATUSER" ] && chown $CATUSER __MVC_RELOCATE__$LOGDIR/err or.log | [ -n "$CATUSER" ] && chown $CATUSER __MVC_RELOCATE__$LOGDIR/err or.log | |||
[ -n "$CATGROUP" ] && chgrp $CATGROUP __MVC_RELOCATE__$LOGDIR/err or.log | [ -n "$CATGROUP" ] && chgrp $CATGROUP __MVC_RELOCATE__$LOGDIR/err or.log | |||
fi | fi | |||
else | else | |||
LOGDIR='__MVC_CATROOT__' | LOGDIR='__MVC_CATROOT__' | |||
mkdir -p __MVC_RELOCATE__$LOGDIR/orders | mkdir -p __MVC_RELOCATE__$LOGDIR/orders | |||
mkdir -p __MVC_RELOCATE__$LOGDIR/logs | mkdir -p __MVC_RELOCATE__$LOGDIR/logs | |||
chmod $DMODE __MVC_RELOCATE__$LOGDIR/logs | chmod $DMODE __MVC_RELOCATE__$LOGDIR/logs | |||
chmod $DMODE __MVC_RELOCATE__$LOGDIR/orders | chmod $DMODE __MVC_RELOCATE__$LOGDIR/orders | |||
touch __MVC_RELOCATE__$LOGDIR/error.log | touch __MVC_RELOCATE__$LOGDIR/logs/error.log | |||
if test -n "$CATUSER" | if test -n "$CATUSER" | |||
then | then | |||
[ -n "$CATUSER" ] && chown $CATUSER __MVC_RELOCATE__$LOGDIR/err | [ -n "$CATUSER" ] && chown $CATUSER __MVC_RELOCATE__$LOGDIR/log | |||
or.log | s/error.log | |||
[ -n "$CATGROUP" ] && chgrp $CATGROUP __MVC_RELOCATE__$LOGDIR/err | [ -n "$CATGROUP" ] && chgrp $CATGROUP __MVC_RELOCATE__$LOGDIR/log | |||
or.log | s/error.log | |||
fi | fi | |||
fi | fi | |||
chmod $FMODE __MVC_RELOCATE__$LOGDIR/error.log | chmod $FMODE __MVC_RELOCATE__$LOGDIR/logs/error.log | |||
chmod $FMODE __MVC_RELOCATE____MVC_CATROOT__/catalog.cfg | chmod $FMODE __MVC_RELOCATE____MVC_CATROOT__/catalog.cfg | |||
## Create Bcrypt Pepper | ||||
perl -e '@c=("A".."Z","a".."z",0..9);$p.=$c[rand(scalar @c)] for 1..32; print $p | ||||
' > __MVC_RELOCATE____MVC_CATROOT__/variables/BCRYPT_PEPPER | ||||
# Make cache directories to store tmps. | # Make cache directories to store tmps. | |||
if test -n '__MVC_CACHEDIR__' | if test -n '__MVC_CACHEDIR__' | |||
then | then | |||
CACHEDIR='__MVC_CACHEDIR__' | CACHEDIR='__MVC_CACHEDIR__' | |||
mkdir -p __MVC_RELOCATE__$CACHEDIR/session | mkdir -p __MVC_RELOCATE__$CACHEDIR/session | |||
ln -s $CACHEDIR/session __MVC_RELOCATE____MVC_CATROOT__ | ln -s $CACHEDIR/session __MVC_RELOCATE____MVC_CATROOT__ | |||
mkdir -p __MVC_RELOCATE__$CACHEDIR/tmp | mkdir -p __MVC_RELOCATE__$CACHEDIR/tmp | |||
ln -s $CACHEDIR/tmp __MVC_RELOCATE____MVC_CATROOT__ | ln -s $CACHEDIR/tmp __MVC_RELOCATE____MVC_CATROOT__ | |||
else | else | |||
CACHEDIR='__MVC_CATROOT__' | CACHEDIR='__MVC_CATROOT__' | |||
skipping to change at line 93 | skipping to change at line 121 | |||
# Fix directory ownership if running as root | # Fix directory ownership if running as root | |||
if test -n "$CATUSER" | if test -n "$CATUSER" | |||
then | then | |||
for i in $LOGDIR/logs $LOGDIR/orders $CACHEDIR/session $CACHEDIR/tmp | for i in $LOGDIR/logs $LOGDIR/orders $CACHEDIR/session $CACHEDIR/tmp | |||
do | do | |||
[ -n "$CATUSER" ] && chown $CATUSER __MVC_RELOCATE__$i | [ -n "$CATUSER" ] && chown $CATUSER __MVC_RELOCATE__$i | |||
[ -n "$CATGROUP" ] && chgrp $CATGROUP __MVC_RELOCATE__$i | [ -n "$CATGROUP" ] && chgrp $CATGROUP __MVC_RELOCATE__$i | |||
done | done | |||
fi | fi | |||
# Remove .git directory from installed catalog, if present (it is copied during | ||||
makecat, if the template was cloned from Git) | ||||
if test -d "__MVC_RELOCATE____MVC_CATROOT__/.git" | ||||
then | ||||
rm -rf __MVC_RELOCATE____MVC_CATROOT__/.git | ||||
fi | ||||
End of changes. 8 change blocks. | ||||
8 lines changed or deleted | 37 lines changed or added |