pull/42/head
Aidaho12 2018-08-13 13:35:02 +06:00
parent 15442ffc6a
commit fc2b657c2e
3 changed files with 4 additions and 42 deletions

View File

@ -1,36 +0,0 @@
FROM centos
MAINTAINER Pavel Loginov (https://github.com/Aidaho12/haproxy-wi)
ENV http_proxy ip:3128
ENV https_proxy ip:3128
COPY epel.repo /etc/yum.repos.d/epel.repo
RUN yum -y install git nmap-ncat python34 dos2unix python34-pip httpd yum-plugin-remove-with-leaves svn gcc-c++ gcc gcc-gfortran python34-devel
COPY haproxy-wi.conf /etc/httpd/conf.d/haproxy-wi.conf
RUN git clone https://github.com/Aidaho12/haproxy-wi.git /var/www/haproxy-wi
RUN mkdir /var/www/haproxy-wi/keys/
RUN mkdir /var/www/haproxy-wi/app/certs/
RUN chown -R apache:apache /var/www/haproxy-wi/
RUN pip3 install -r /var/www/haproxy-wi/requirements.txt --no-cache-dir
RUN chmod +x /var/www/haproxy-wi/app/*.py
RUN chmod +x /var/www/haproxy-wi/app/tools/*.py
WORKDIR /var/www/haproxy-wi/app
RUN ./update_db.py
RUN chown -R apache:apache /var/www/haproxy-wi/
RUN chown -R apache:apache /var/log/httpd/
RUN tools/checker_master.py &
RUN yum -y erase git python34-pip python34-devel gcc-c++ gcc-gfortran gcc --remove-leaves
RUN yum -y autoremove yum-plugin-remove-with-leaves
RUN yum clean all
RUN rm -rf /var/cache/yum
RUN rm -f /etc/yum.repos.d/*
EXPOSE 80
VOLUME /var/www/haproxy-wi/
CMD /usr/sbin/httpd -DFOREGROUND

View File

@ -278,6 +278,7 @@ if serv is not None and act == "configShow":
print("<center><h3>Config from %s</h3>" % serv)
print('<p class="accordion-expand-holder">'
'<a class="accordion-expand-all ui-button ui-widget ui-corner-all" href="#">Expand all</a>'
'<a class="ui-button ui-widget ui-corner-all" title="Edit this run config" target="_blank" href="config.py?serv='+serv+'&open=open">Edit</a>'
'</p>')
print('</center>')

View File

@ -60,7 +60,7 @@ pre {
font-style: italic;
font-weight: bold;
height: 32px;
background-color: #f4ab76;
border-bottom: 1px solid aliceblue;
padding-left: 20px;
padding-top: 2px;
padding-bottom: 3px;
@ -172,8 +172,8 @@ pre {
background-color: #dbedff;
margin-bottom: 10px;
}
.lineDiffMinus, .lineDiffPlus {
padding-left: 5px;
.lineDiffMinus, .lineDiffPlus, .lineDog, .lineDiff {
padding-left: 15px;
}
.lineDiffMinus {
background-color: #ffdce0;
@ -181,9 +181,6 @@ pre {
.lineDiffPlus {
background-color: #cdffd8;
}
.lineDiff {
padding-left: 5px;
}
.param {
font-weight: bold;
padding-left: 13px;