PiFrame/PiFrameFleet
PiFrame/PiFrameFleet
1
0
Fork 0
Code Issues 2 Pull requests Releases Activity

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

Browse source
This commit is contained in:
KemoNine 2020-08-22 17:12:24 -04:00
parent d1b54f59dc
commit 26b1d0f51e
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Dockerfile
View file

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

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

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

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

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