diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index d85f8d50..87186e25 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl liberapay: # Replace with a single Liberapay username issuehunt: # Replace with a single IssueHunt username otechie: # Replace with a single Otechie username -custom: ['https://www.paypal.me/aidaho'] +custom: ['https://www.paypal.me/haproxywi'] diff --git a/app/scripts/install_haproxy.sh b/app/scripts/install_haproxy.sh index 44246e9f..65cfcda4 100644 --- a/app/scripts/install_haproxy.sh +++ b/app/scripts/install_haproxy.sh @@ -37,7 +37,7 @@ else #wget http://cbs.centos.org/kojifiles/packages/haproxy/1.8.1/5.el7/x86_64/haproxy18-1.8.1-5.el7.x86_64.rpm wget http://au1.mirror.crc.id.au/repo/el7-extra/x86_64/haproxy-2.0.3-2.el7.x86_64.rpm #sudo yum install haproxy18-1.8.1-5.el7.x86_64.rpm -y - sudo yum install haproxy-1.9.1-1.el7.x86_64.rpm -y + sudo yum install haproxy-2.0.3-2.el7.x86_64.rpm -y fi if [ $? -eq 1 ] @@ -46,7 +46,7 @@ then #wget http://cbs.centos.org/kojifiles/packages/haproxy/1.8.1/5.el7/x86_64/haproxy18-1.8.1-5.el7.x86_64.rpm wget http://au1.mirror.crc.id.au/repo/el7-extra/x86_64/haproxy-2.0.3-2.el7.x86_64.rpm #sudo yum install haproxy18-1.8.1-5.el7.x86_64.rpm -y - sudo yum install haproxy-1.9.1-1.el7.x86_64.rpm -y + sudo yum install haproxy-2.0.3-2.el7.x86_64.rpm -y fi if [ $? -eq 1 ] then @@ -118,4 +118,4 @@ then echo "error: Can't start Haproxy service

" exit 1 fi -echo "success" +echo "success" \ No newline at end of file diff --git a/app/scripts/waf.sh b/app/scripts/waf.sh index b84cc54d..f61da005 100644 --- a/app/scripts/waf.sh +++ b/app/scripts/waf.sh @@ -34,11 +34,11 @@ if [ -f $HAPROXY_PATH/waf/modsecurity.conf ];then exit 1 fi if hash apt-get 2>/dev/null; then - sudo apt install libevent-dev apache2-dev libpcre3-dev libxml2-dev gcc -y + sudo apt install libevent-dev apache2-dev libpcre3-dev libxml2-dev gcc pcre-devel -y else - wget -O /tmp/yajl-devel-2.0.4-4.el7.x86_64.rpm http://rpmfind.net/linux/centos/7.6.1810/os/x86_64/Packages/yajl-devel-2.0.4-4.el7.x86_64.rpm >> /dev/null + wget -O /tmp/yajl-devel-2.0.4-4.el7.x86_64.rpm http://rpmfind.net/linux/centos/7/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 - sudo yum install /tmp/libevent-devel-2.0.21-4.el7.x86_64.rpm /tmp/yajl-devel-2.0.4-4.el7.x86_64.rpm httpd-devel libxml2-devel gcc curl-devel -y >> /dev/null + sudo yum install /tmp/libevent-devel-2.0.21-4.el7.x86_64.rpm /tmp/yajl-devel-2.0.4-4.el7.x86_64.rpm httpd-devel libxml2-devel gcc curl-devel pcre-devel -y >> /dev/null fi wget -O /tmp/modsecurity-2.9.2.tar.gz https://www.modsecurity.org/tarball/2.9.2/modsecurity-2.9.2.tar.gz >> /dev/null