tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated pwrd, installer now allows user/directory locations 

Former-commit-id: cb5c74a260dfcfadec820c0fbbd589e602ac6249
This commit is contained in:
fbsanchez 2018-12-04 21:27:46 +01:00
parent b2758e6738
commit b542cb868b
8 changed files with 200 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pandora_server/util/pwrd/config.json Normal file
View File

@ -0,0 +1,21 @@
{
"capabilities": [
{
"browserName": "*firefox",
"maxInstances": 1,
"seleniumProtocol": "Selenium"
},
{
"browserName": "firefox",
"maxInstances": 1,
"seleniumProtocol": "WebDriver"
}
],
"configuration": {
"proxy": "org.openqa.grid.selenium.proxy.DefaultRemoteProxy",
"maxSession": 1,
"port": 5555,
"register": true,
"registerCycle": 5000
}
}

20
pandora_server/util/pwrd/extras/crontab_entries_sample Normal file
View File

@ -0,0 +1,20 @@
# Sample PWRD crontab control tweaks
# Do not allow firefox running for more than 1h
0 * * * * root /opt/pwrd_maintenance.sh -k
# Force node-start
*/5 * * * * root /opt/pwrd_maintenance.sh -s
# Reset firefox version if does not match required 47.0.1
* * * * * root /opt/pwrd_maintenance.sh -f
# Restart node if java process is not found
* * * * * root /opt/pwrd_maintenance.sh -r
# Restart node if no activity since last check
*/5 * * * * root /opt/pwrd_maintenance.sh -c1
# Restart node if connection have been lost to hub
*/5 * * * * root /opt/pwrd_maintenance.sh -c2

52
pandora_server/util/pwrd/extras/pwrd_maintenance.sh Normal file
View File

@ -0,0 +1,52 @@
#!/bin/bash
#
# Sample PWRD maintenance script
# **********************************************************************
# **********************************************************************
# Settings
hub_ip="192.168.1.10"
hub_port="4444"
# Customize PWR global installation directory
PWR_FIREFOX_INSTALLDIR="/opt"
# **********************************************************************
if [ "$1" == "-k" ]; then
killall --older-than 1h firefox >/dev/null 2>&1
elif [ "$1" == "-s" ]; then
/etc/init.d/pwrd start-node http://$hub_ip:$hub_port/grid/register > /dev/null 2>&1
elif [ "$1" == "-f" ]; then
if [ "`firefox --version`" != "Mozilla Firefox 47.0.1" ]; then
$PWR_FIREFOX_INSTALLDIR/restore_firefox.sh >/dev/null 2>&1
echo `date +"%c"` Firefox restored > /tmp/restore_firefox.log
[`/etc/init.d/pwrd status | grep "Node is running" | wc -l` -eq 1 ] && /etc/init.d/pwrd restart-node http://$hub_ip:$hub_port/grid/register > /dev/null 2>&1
[`/etc/init.d/pwrd status | grep "PWRD is running" | wc -l` -eq 1 ] && /etc/init.d/pwrd restart > /dev/null 2>&1
fi
elif [ "$1" == "-r" ]; then
if [ ` ps aux | grep "java -jar" | grep -v grep | wc -l` -lt 1 ]; then
[`/etc/init.d/pwrd status | grep "Node is running" | wc -l` -eq 1 ] && /etc/init.d/pwrd restart-node http://$hub_ip:$hub_port/grid/register > /dev/null 2>&1
[`/etc/init.d/pwrd status | grep "PWRD is running" | wc -l` -eq 1 ] && /etc/init.d/pwrd restart > /dev/null 2>&1
echo `date +"%c"` PWRD restarted, java process not found > /tmp/pwrd_restart_detected.log
fi
elif [ "$1" == "-c1" ]; then
if [ $(/etc/pandora/plugins/grep_log /var/log/pwr/pwr_std.log check_pwrd ".*" | wc -l) -eq 0 ]; then
[`/etc/init.d/pwrd status | grep "Node is running" | wc -l` -eq 1 ] && /etc/init.d/pwrd restart-node http://$hub_ip:$hub_port/grid/register > /dev/null 2>&1
[`/etc/init.d/pwrd status | grep "PWRD is running" | wc -l` -eq 1 ] && /etc/init.d/pwrd restart > /dev/null 2>&1
echo $(date +"%c") PWRD restarted, no output detected in log > /tmp/pwrd_restart_detected.log
fi
elif [ "$1" == "-c2" ]; then
if [ $(/etc/pandora/plugins/grep_log /var/log/pwr/pwr_std.log check_pwrd_err_conn "refused" | grep "$hub_ip:$hub_port [/$hub_ip] failed:" | wc -l) -gt 0 ]; then
/etc/init.d/pwrd restart-node http://$hub_ip:$hub_port/grid/register > /dev/null 2>&1
echo $(date +"%c") PWRD restarted, lost connection with hub > /tmp/pwrd_restart_detected.log
fi
fi

20
pandora_server/util/pwrd/extras/restore_firefox.sh Normal file
View File

@ -0,0 +1,20 @@
#!/bin/bash
#
# Script to restore firefox to tar
#
# **********************************************************************
# Customize PWR global installation directory
PWR_FIREFOX_INSTALLDIR="/opt"
cd $PWR_FIREFOX_INSTALLDIR
if [ -f firefox-47.0.1.tar ]; then
rm -rf firefox-47 >/dev/null 2>&1
mv firefox firefox_ >/dev/null 2>&1
tar xvf firefox-47.0.1.tar >/dev/null 2>&1
mv firefox firefox-47 >/dev/null 2>&1
mv firefox_ firefox >/dev/null 2>&1
else
echo "firefox-47.0.1.tar not found, please leave a copy at $PWR_FIREFOX_INSTALLDIR"
fi

BIN
pandora_server/util/pwrd/firefox-43.0.tar
View File

Binary file not shown.

1
pandora_server/util/pwrd/firefox-47.0.1.tar.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
4881ba55982d75040775bafdffcdf57b2cd7ea13

95
pandora_server/util/pwrd/install_pwrd.sh
View File

@ -1,7 +1,6 @@
#!/bin/bash
if [ "$1" == "" ] || [ "$1" != "--install" ]; then
cat<<_HELP
HELP=`cat<<_HELP
**********************
PWR Server installer
**********************
@ -9,10 +8,14 @@ if [ "$1" == "" ] || [ "$1" != "--install" ]; then
To install the Pandora web robot daemon (pwrd)
Please launch this script as root:
$0 --install [directory]
$0 --install [[user] [directory]]
_HELP
`
if [ "$1" == "" ] || [ "$1" != "--install" ]; then
echo "$HELP"
exit 0
fi
@ -25,9 +28,31 @@ else
echo "Xvfb is required, please confirm is installed in your system"
fi
# default user is running user
GLOBAL_INST_USER=`whoami`
if [ "$2" != "" ] && [ -d "$2" ]; then
GLOBAL_INST_DIR=$2
if [ "$2" != "" ]; then
if [ `cat /etc/passwd | cut -f1 -d':' | grep -w "$2" | wc -l` -gt 0 ]; then
GLOBAL_INST_USER=$2
elif [ -d "$2" ]; then
GLOBAL_INST_DIR=$2
else
echo "Cannot use \"$2\" as user nor directory"
echo "$HELP"
exit 0
fi
fi
if [ "$3" != "" ]; then
if [ -d "$3" ]; then
GLOBAL_INST_DIR=$3
elif [ `cat /etc/passwd | cut -f1 -d':' | grep -w "$3" | wc -l` -gt 0 ]; then
GLOBAL_INST_USER=$3
else
echo "Cannot use \"$3\" as directory nor user"
echo "$HELP"
exit 0
fi
fi
chmod +x pwrd
@ -37,23 +62,32 @@ PWR_SERVER_RSC=$GLOBAL_INST_DIR/etc/pwr/tmp
PWR_SERVER_LOG=$GLOBAL_INST_DIR/var/log/pwr
PWR_FIREFOX_INSTALLDIR=$GLOBAL_INST_DIR/opt
mkdir -p $PWR_SERVER_DEST
mkdir -p $PWR_SERVER_LOG
mkdir -p $PWR_SERVER_RSC
mkdir -p $PWR_FIREFOX_INSTALLDIR
PWR_FIREFOX_INSTALLDIR_ESCAPED=`echo $PWR_FIREFOX_INSTALLDIR | sed 's/\\//\\\\\//g'`
GLOBAL_INST_DIR_ESCAPED=`echo $GLOBAL_INST_DIR | sed 's/\\//\\\\\//g'`
[ -d $PWR_SERVER_DEST ] || mkdir -p $PWR_SERVER_DEST
[ -d $PWR_SERVER_LOG ] || mkdir -p $PWR_SERVER_LOG
[ -d $PWR_SERVER_RSC ] || mkdir -p $PWR_SERVER_RSC
[ -d $PWR_FIREFOX_INSTALLDIR ] || mkdir -p $PWR_FIREFOX_INSTALLDIR
[ -d $GLOBAL_INST_DIR/etc/init.d ] || mkdir -p $GLOBAL_INST_DIR/etc/init.d
tar xvf firefox-47.0.1.tar >/dev/null
mv firefox $PWR_FIREFOX_INSTALLDIR/
mv firefox $PWR_FIREFOX_INSTALLDIR/firefox-47
ln -s $PWR_FIREFOX_INSTALLDIR/firefox-47/firefox $PWR_FIREFOX_INSTALLDIR/firefox
tar xvzf firefox_profile.tar.gz >/dev/null
chown -R `whoami`. firefox_profile
mv firefox_profile $PWR_FIREFOX_INSTALLDIR
if [ $? -ne 0 ]; then
echo "Failed to deploy firefox profile, please retry installation"
exit 1
fi
chown -R "$GLOBAL_INST_USER". firefox_profile
[ ! -d "$PWR_FIREFOX_INSTALLDIR/firefox_profile" ] && mv firefox_profile $PWR_FIREFOX_INSTALLDIR
mkdir -P $PWR_FIREFOX_INSTALLDIR/selenium
mv config.json $PWR_FIREFOX_INSTALLDIR/selenium/
[ -d "$PWR_FIREFOX_INSTALLDIR/selenium" ] || mkdir -p $PWR_FIREFOX_INSTALLDIR/selenium
ln -s $PWR_FIREFOX_INSTALLDIR/firefox/firefox /usr/bin/firefox
cp config.json $PWR_FIREFOX_INSTALLDIR/selenium/
ln -s $PWR_FIREFOX_INSTALLDIR/firefox /usr/bin/firefox
# Generate logrotate configuration
echo <<EO_LROTATE > /etc/logrotate.d/pwrd
@ -72,14 +106,35 @@ echo <<EO_LROTATE > /etc/logrotate.d/pwrd
EO_LROTATE
# Update pwrd daemon
if [ "$GLOBAL_INST_DIR" != "" ]; then
sed -i "s/PWR_GLOBAL_DIR=\"\"/PWR_GLOBAL_DIR=\"\\$GLOBAL_INST_DIR\"/g" ./pwrd
fi
cp ./extras/restore_firefox.sh $PWR_FIREFOX_INSTALLDIR/
cp ./extras/pwrd_maintenance.sh $PWR_FIREFOX_INSTALLDIR/
cp ./selenium-server-standalone-2.53.1.jar $PWR_SERVER_DEST/
cp ./pwrd /etc/init.d/pwrd
cp ./pwrd $GLOBAL_INST_DIR/etc/init.d/pwrd
chmod +x /etc/init.d/pwrd
# Update pwrd daemon
if [ "$GLOBAL_INST_DIR" != "" ]; then
echo "Adjusting pwrd global directory to: $GLOBAL_INST_DIR"
sed -i "s/PWR_GLOBAL_DIR=\"\"/PWR_GLOBAL_DIR=\"$GLOBAL_INST_DIR_ESCAPED\"/g" /etc/init.d/pwrd
sed -i "s/PWR_GLOBAL_DIR=\"\"/PWR_GLOBAL_DIR=\"$GLOBAL_INST_DIR_ESCAPED\"/g" $GLOBAL_INST_DIR/etc/init.d/pwrd
echo "Adjusting pwrd_maintenance global directory to: $PWR_FIREFOX_INSTALLDIR"
sed -i "s/PWR_FIREFOX_INSTALLDIR=\"\/opt\"/PWR_FIREFOX_INSTALLDIR=\"$PWR_FIREFOX_INSTALLDIR_ESCAPED\"/g" $PWR_FIREFOX_INSTALLDIR/pwrd_maintenance.sh
echo "Adjusting restore_firefox global directory to: $PWR_FIREFOX_INSTALLDIR"
sed -i "s/PWR_FIREFOX_INSTALLDIR=\"\/opt\"/PWR_FIREFOX_INSTALLDIR=\"$PWR_FIREFOX_INSTALLDIR_ESCAPED\"/g" $PWR_FIREFOX_INSTALLDIR/restore_firefox.sh
fi
if [ "$GLOBAL_INST_USER" != "" ]; then
echo "Adjusting pwrd global user to: $GLOBAL_INST_USER"
sed -i "s/USER=\"root\"/USER=\"$GLOBAL_INST_USER\"/g" /etc/init.d/pwrd
sed -i "s/USER=\"root\"/USER=\"$GLOBAL_INST_USER\"/g" $GLOBAL_INST_DIR/etc/init.d/pwrd
fi
[ "$GLOBAL_INST_USER" != "" ] && chown -R "$GLOBAL_INST_USER". $PWR_SERVER_DEST
[ "$GLOBAL_INST_USER" != "" ] && chown -R "$GLOBAL_INST_USER". $PWR_SERVER_LOG
[ "$GLOBAL_INST_USER" != "" ] && chown -R "$GLOBAL_INST_USER". $PWR_SERVER_RSC
cat <<EOF
*********************
PWR Server deployed
@ -87,7 +142,7 @@ cat <<EOF
Succesfully installed!
Please start the service with:
Now you can start the service with:
/etc/init.d/pwrd start

20
pandora_server/util/pwrd/pwrd
View File

@ -40,7 +40,7 @@ JAVA=/usr/bin/java
PWR_GLOBAL_DIR=""
# Customize PWR running user
USER=root
USER="root"
# Customize PWR application files directory
PWR_INST_DIR="$PWR_GLOBAL_DIR/opt"
@ -96,6 +96,7 @@ function start_xvfb() {
# Stop Xvfb
function stop_xvfb() {
echo
if test -f $XVFB_PID_FILE ; then
# Check if there's more instances of pwrd running i.e. standalone + node
if [ ! -e "$BASE_DIR/pwrd_node.pid" ] && [ ! -e "$BASE_DIR/pwrd.pid" ]; then
@ -114,7 +115,7 @@ function stop_xvfb() {
else
[ -e $BASE_DIR/pwrd_node.pid ] && echo -n `cat $BASE_DIR/pwrd_node.pid`
[ -e $BASE_DIR/pwrd.pid ] && echo -n `cat $BASE_DIR/pwrd.pid`
echo "pwrd processes left. Skipping Xvfb"
echo -e "\nThere're pwrd processes left. Skipping Xvfb"
fi
fi
}
@ -258,24 +259,25 @@ function stop() {
echo -n "Stopping PWRD..."
PID=$(cat $pid_file)
[ "$PID" == "" ] && PID=`ps aux | grep "$JAVA -jar $PWR" | grep -v grep | awk '{print $2}'`
[ "$PID" != "" ] && su $USER -c "kill -3 $PID"
[ "$PID" != "" ] && kill -9 $PID >/dev/null 2>&1
[ "$PID" != "" ] && ps --pid $PID >/dev/null && su $USER -c "kill -3 $PID"
[ "$PID" != "" ] && ps --pid $PID >/dev/null && kill -9 $PID >/dev/null 2>&1
if [ $? -eq 0 ]; then
sleep 2
test -f $pid_file && rm -f $pid_file
if [ -e /etc/rc.d/init.d/functions ]; then
success
fi
test -f $pid_file && rm -f $pid_file
stop_xvfb
else
echo "PWRD could not be stopped..."
[ "$PID" == "" ] && [ -f $pid_file ] && rm -f $pid_file
if [ -e /etc/rc.d/init.d/functions ]; then
failure
else
echo "Failed"
fi
fi
stop_xvfb
# Clean pid file
test -f $pid_file && rm -f $pid_file
else
echo "PWRD is not running."
stop_xvfb
@ -297,7 +299,7 @@ function status() {
if test -f $pid_file ; then
echo "checking: $pid_file"
PID=`cat $pid_file`
if [ "$PID" != "" ] && ps --pid $PID >/dev/null ; then
if [ "$PID" != "" ] && ps --pid $PID >/dev/null; then
echo "PWRD$mode is running: $PID"
if test -f $XVFB_PID_FILE ; then
PID=`cat $XVFB_PID_FILE`