@@ -2125,6 +2125,9 @@ drun "cat ${DSHIELDINI}"
21252125# making sure permissions are right for the ini file
21262126sudorun " chown -R ${SYSUSERID} :webhpot ${DSHIELDDIR} "
21272127sudorun " chmod 0640 ${DSHIELDINI} "
2128+ if [ -f /etc/dshield.ini ]; then
2129+ sudorun " rm /etc/dshield.ini"
2130+ fi
21282131sudorun " ln -s ${DSHIELDINI} /etc/dshield.ini"
21292132
21302133
@@ -2229,10 +2232,10 @@ dlog "activating virtual environment"
22292232run ' source cowrie-env/bin/activate'
22302233if [ " $FAST " == " 0" ]; then
22312234 dlog " installing cowrie dependencies: requirements.txt"
2232- run ' sg cowrie -c "pip3 install --require-virtualenv --upgrade pip"'
2233- run ' sg cowrie -c "pip3 install --require-virtualenv --upgrade bcrypt"'
2234- run ' sg cowrie -c "pip3 install --require-virtualenv --upgrade requests"'
2235- run ' sg cowrie -c "pip3 install --require-virtualenv -r requirements.txt"'
2235+ run ' sudo -u cowrie -g cowrie -c "pip3 install --require-virtualenv --upgrade pip"'
2236+ run ' sudo -u cowrie -g cowrie -c "pip3 install --require-virtualenv --upgrade bcrypt"'
2237+ run ' sudo -u cowrie -g cowrie -c "pip3 install --require-virtualenv --upgrade requests"'
2238+ run ' sudo -u cowrie -g cowrie -c "pip3 install --require-virtualenv -r requirements.txt"'
22362239 # shellcheck disable=SC2181
22372240 if [ ${?} -ne 0 ]; then
22382241 outlog " Error installing dependencies from requirements.txt. See ${LOGFILE} for details."
22482251# dlog "installing dependencies requirements-output.txt"
22492252# run 'pip3 install --upgrade -r requirements-output.txt'
22502253if [ " $ID " != " opensuse" ] ; then
2251- run ' sg cowrie -c "pip3 install --require-virtualenv --upgrade requests"'
2254+ run ' sudo -u cowrie -g cowrie -c "pip3 install --require-virtualenv --upgrade requests"'
22522255 # shellcheck disable=SC2181
22532256 if [ ${?} -ne 0 ]; then
22542257 outlog " Error installing dependencies from requirements-output.txt. See ${LOGFILE} for details."
0 commit comments