Skip to content

Commit

Permalink
Merge pull request #197 from xavier-hernandez/develop
Browse files Browse the repository at this point in the history
v1.1.33
  • Loading branch information
xavier-hernandez authored Jan 21, 2025
2 parents 99ba7fe + 5d8fdf1 commit 6fb93b3
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN make install
WORKDIR /goaccess
RUN cp /goaccess-temp/goaccess.tar.gz .
RUN tar --strip-components=1 -xzvf goaccess.tar.gz
RUN sed -i "s/GWSocket<\/a>/GWSocket<\/a> ( <a href='https:\/\/tiny.one\/xgoan'>GOAN<\/a> <span>v1.1.32<\/span> )/" /goaccess/resources/tpls.html
RUN sed -i "s/GWSocket<\/a>/GWSocket<\/a> ( <a href='https:\/\/tiny.one\/xgoan'>GOAN<\/a> <span>v1.1.33<\/span> )/" /goaccess/resources/tpls.html
RUN sed -i "s/bottom: 190px/bottom: 260px/" /goaccess/resources/css/app.css
RUN ./configure --enable-utf8 --enable-geoip=mmdb --with-getline
RUN make
Expand Down Expand Up @@ -71,7 +71,7 @@ RUN chmod +x start.sh
RUN mkdir -p /goaccess-logs/archives

VOLUME ["/opt/log"]
VOLUME ["/opt/custom"]

EXPOSE 7880
#CMD ["bash", "/goan/start.sh"]
ENTRYPOINT ["tini", "--", "/goan/start.sh"]
Binary file modified assests/maxmind/GeoLite2-ASN.mmdb
Binary file not shown.
Binary file modified assests/maxmind/GeoLite2-City.mmdb
Binary file not shown.
Binary file modified assests/maxmind/GeoLite2-Country.mmdb
Binary file not shown.
10 changes: 8 additions & 2 deletions resources/scripts/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ source $(dirname "$0")/logs/ncsa_combined.sh
source $(dirname "$0")/logs/nginx_access.sh
source $(dirname "$0")/logs/caddy.sh

goan_version="GOAN v1.1.32"
goan_version="GOAN v1.1.33"
goan_log_path="/opt/log"

goaccess_ping_interval=15
Expand Down Expand Up @@ -81,7 +81,13 @@ elif [[ "${LOG_TYPE}" == "TRAEFIK" ]]; then
elif [[ "${LOG_TYPE}" == "NCSA_COMBINED" ]]; then
ncsa_combined
elif [[ "${LOG_TYPE}" == "CUSTOM" ]]; then
custom
if [ -d "/opt/custom" ] && [ -w "/opt/custom" ]; then
echo "Custom directory /opt/custom is available."
custom
else
echo "Custom directory /opt/custom is not available. Exiting..."
exit 1
fi
elif [[ "${LOG_TYPE}" == "NGINX_ACCESS" ]]; then
nginx_access
elif [[ "${LOG_TYPE}" == "CADDY_V1" ]]; then
Expand Down

0 comments on commit 6fb93b3

Please sign in to comment.