github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v3.2 

Bugs
pull/42/head
Aidaho12 2018-08-23 12:48:10 +06:00
parent f9ae2e48a2
commit 3d508cb0b2
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/funct.py
View File

@ -265,7 +265,7 @@ def install_haproxy(serv, **kwargs):
proxy_serv = proxy
else:
proxy_serv = ""
commands = [ "chmod +x "+tmp_config_path+script+" && " +tmp_config_path+"/"+script +" PROXY=" + proxy_serv+
commands = [ "sudo chmod +x "+tmp_config_path+script+" && " +tmp_config_path+"/"+script +" PROXY=" + proxy_serv+
" SOCK_PORT="+haproxy_sock_port+" STAT_PORT="+stats_port+" STAT_FILE="+server_state_file+
" STATS_USER="+stats_user+" STATS_PASS="+stats_password ]
@ -288,7 +288,7 @@ def syn_flood_protect(serv, **kwargs):
os.system("cp scripts/%s ." % script)
commands = [ "chmod +x "+tmp_config_path+script, tmp_config_path+script+ " "+enable ]
commands = [ "sudo chmod +x "+tmp_config_path+script, tmp_config_path+script+ " "+enable ]
upload(serv, tmp_config_path, script)
os.system("rm -f %s" % script)
@ -304,7 +304,7 @@ def waf_install(serv, **kwargs):
os.system("cp scripts/%s ." % script)
commands = [ "chmod +x "+tmp_config_path+script+" && " +tmp_config_path+script +" PROXY=" + proxy+
commands = [ "sudo chmod +x "+tmp_config_path+script+" && " +tmp_config_path+script +" PROXY=" + proxy+
" HAPROXY_PATH="+haproxy_dir +" VERSION="+ver ]
upload(serv, tmp_config_path, script)

4
app/options.py
View File

@ -357,10 +357,10 @@ if form.getvalue('master'):
funct.upload(master, tmp_config_path, script)
funct.upload(slave, tmp_config_path, script)
commands = [ "chmod +x "+tmp_config_path+script, tmp_config_path+script+" MASTER "+interface+" "+vrrpip ]
commands = [ "sudo chmod +x "+tmp_config_path+script, tmp_config_path+script+" MASTER "+interface+" "+vrrpip ]
funct.ssh_command(master, commands)
commands = [ "chmod +x "+tmp_config_path+script, tmp_config_path+script+" BACKUP "+interface+" "+vrrpip ]
commands = [ "sudo chmod +x "+tmp_config_path+script, tmp_config_path+script+" BACKUP "+interface+" "+vrrpip ]
funct.ssh_command(slave, commands)
os.system("rm -f %s" % script)

2
app/scripts/waf.sh
View File

@ -29,7 +29,7 @@ if [ -f $HAPROXY_PATH/waf/modsecurity.conf ];then
exit 1
fi
if hash apt-get 2>/dev/null; then
sudo apt-get install yajl-dev libevent-dev httpd-dev libxml2-dev gcc curl-dev -y
sudo apt-get install yajl-dev libevent-dev apache2-dev libxml2-dev gcc curl-dev -y
else
wget -O /tmp/yajl-devel-2.0.4-4.el7.x86_64.rpm http://rpmfind.net/linux/centos/7.5.1804/os/x86_64/Packages/yajl-devel-2.0.4-4.el7.x86_64.rpm >> /dev/null
wget -O /tmp/libevent-devel-2.0.21-4.el7.x86_64.rpm http://mirror.centos.org/centos/7/os/x86_64/Packages/libevent-devel-2.0.21-4.el7.x86_64.rpm >> /dev/null

3
install.sh
View File

@ -236,7 +236,7 @@ sed -i 's/#$ModLoad imudp/$ModLoad imudp/g' /etc/rsyslog.conf
systemctl daemon-reload
systemctl restart logrotate
systemctl restart rsyslog
systemctl restart cmetrics_haproxy.service
systemctl restart metrics_haproxy.service
systemctl restart checker_haproxy.service
systemctl enable metrics_haproxy.service
systemctl enable checker_haproxy.service
@ -418,7 +418,6 @@ cd /var/www/$HOME_HAPROXY_WI/app
./update_db.py
if hash apt-get 2>/dev/null; then
sudo chown -R www-data:www-data /var/www/$HOME_HAPROXY_WI/
sudo chown -R www-data:www-data /var/log/httpd/
sudo chown -R www-data:www-data /var/log/apache2/
else
sudo chown -R apache:apache /var/www/$HOME_HAPROXY_WI/