Browse Source

Misc fixes / updates- Remove python3- Update munin timeouts- Fix some typos- Adjust for local fork of monit-dashboard

master
KemoNine 9 months ago
parent
commit
26b1d0f51e
  1. 9
      Dockerfile
  2. 4
      root/etc/cont-init.d/30-config
  3. 2
      root/etc/services.d/monit-dashboard/run

9
Dockerfile

@ -86,10 +86,8 @@ RUN apt update && apt upgrade -y && \
make -C src install && \
cd /opt && \
echo "**** monit related ***" && \
apt install -y monit python2 && \
curl https://bootstrap.pypa.io/get-pip.py -o /opt/get-pip.py && \
python2 /opt/get-pip.py && \
pip install setuptools==40.8.0 xmltodict==0.11.0 requests==2.21.0 xlsxwriter==1.3.2 web.py==0.51 && \
apt install -y monit python3-pip python3-setuptools python3-wheel && \
pip3 install xmltodict requests xlsxwriter web.py && \
echo "**** munin related ****" && \
apt install -y munin lighttpd && \
echo "**** rtty related ****" && \
@ -115,7 +113,7 @@ RUN apt update && apt upgrade -y && \
go get -u github.com/zhaojh329/rttys && \
cp ~/.asdf/installs/golang/$(asdf latest golang)/packages/bin/rttys /usr/local/bin/ && \
cd /opt && \
echo "**** dashbaord related ****" && \
echo "**** dashboard related ****" && \
apt install -y lighttpd && \
echo "**** syncthing ****" && \
curl -s https://syncthing.net/release-key.txt | apt-key add - && \
@ -135,7 +133,6 @@ RUN apt update && apt upgrade -y && \
rm -rf /opt/wireguard-tools && \
rm -rf /opt/rtty_build && \
rm -rf ~/.asdf && \
rm /opt/get-pip.py && \
apt remove --purge -y build-essential cmake pkg-config libelf-dev libev-dev libssl-dev unzip && \
apt autoremove --purge -y && \
rm -rf /var/lib/apt/lists/*

4
root/etc/cont-init.d/30-config

@ -193,6 +193,8 @@ cgitmpdir /opt/munin/cgi-tmp
graph_strategy cron
html_strategy cron
timeout 15
[dispatcher]
address 127.0.0.1
use_node_name yes
@ -352,7 +354,7 @@ mimetype.assign = (
)
EOF
fi
if [ ! -d "/opt/dashboard/wwww" ] ; then
if [ ! -d "/opt/dashboard/www" ] ; then
mkdir /opt/dashboard/www
chown www-data /opt/dashboard/www
fi

2
root/etc/services.d/monit-dashboard/run

@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
cd /opt/monit-dashboard
/usr/bin/python2 /opt/monit-dashboard/bin/monit-dashboard.py
/usr/bin/python3 /opt/monit-dashboard/bin/monit-dashboard.py
Loading…
Cancel
Save