diff --git a/Dockerfiles/nginx.Dockerfile b/Dockerfiles/nginx.Dockerfile index 96c3e13a0..2b6b2ed9b 100644 --- a/Dockerfiles/nginx.Dockerfile +++ b/Dockerfiles/nginx.Dockerfile @@ -19,7 +19,7 @@ WORKDIR /site RUN docker-entrypoint.sh bundle exec jekyll build && \ find /site/_site -type f -name "*.md" -delete && \ find /site/_site -type f -name "*.html" -exec sed -i "s@/\(docs\|assets\)@/readme/\1@g" "{}" \; && \ - find /site/_site -type f -name "*.html" -exec sed -i 's@\(href=\)"/"@\1"/readme"@g' "{}" \; + find /site/_site -type f -name "*.html" -exec sed -i 's@\(href=\)"/"@\1"/readme/"@g' "{}" \; # build NGINX image FROM alpine:3.16 diff --git a/malcolm-iso/build.sh b/malcolm-iso/build.sh index a292682d3..ac28620d8 100755 --- a/malcolm-iso/build.sh +++ b/malcolm-iso/build.sh @@ -133,7 +133,6 @@ if [ -d "$WORKDIR" ]; then ln -s ./control.py wipe popd >/dev/null 2>&1 cp ./scripts/malcolm_common.py "$MALCOLM_DEST_DIR/scripts/" - cp ./README.md "$MALCOLM_DEST_DIR/" cp ./logstash/certs/*.conf "$MALCOLM_DEST_DIR/logstash/certs/" cp ./logstash/maps/malcolm_severity.yaml "$MALCOLM_DEST_DIR/logstash/maps/" cp -r ./netbox/config/ "$MALCOLM_DEST_DIR/netbox/" diff --git a/malcolm-iso/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-20/16343116973.desktop b/malcolm-iso/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-20/16343116973.desktop index bea9f2c45..3229599b2 100644 --- a/malcolm-iso/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-20/16343116973.desktop +++ b/malcolm-iso/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-20/16343116973.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Version=1.0 Name=Malcolm - README -Exec=/opt/firefox/firefox https://localhost/readme +Exec=/opt/firefox/firefox https://localhost/readme/ Terminal=false X-MultipleArgs=false Type=Application diff --git a/malcolm-iso/config/includes.chroot/usr/share/applications/malcolm-readme.desktop b/malcolm-iso/config/includes.chroot/usr/share/applications/malcolm-readme.desktop index 62f5afcbf..e25936bd7 100644 --- a/malcolm-iso/config/includes.chroot/usr/share/applications/malcolm-readme.desktop +++ b/malcolm-iso/config/includes.chroot/usr/share/applications/malcolm-readme.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Version=1.0 Name=Malcolm - README -Exec=/opt/firefox/firefox https://localhost/readme +Exec=/opt/firefox/firefox https://localhost/readme/ Terminal=false X-MultipleArgs=false Type=Application diff --git a/sensor-iso/build.sh b/sensor-iso/build.sh index 2253739c1..07448527d 100755 --- a/sensor-iso/build.sh +++ b/sensor-iso/build.sh @@ -158,20 +158,8 @@ if [ -d "$WORKDIR" ]; then mv "$SCRIPT_PATH/arkime"/*.deb ./config/packages.chroot/ # format and copy documentation + # TODO pushd "$SCRIPT_PATH/" - pushd ./docs/images - ls -1 *.png | xargs -n 1 bash -c 'convert "$0" "${0%.*}.jpg"' - popd >/dev/null 2>&1 - cp README.md HedgehogLinux.jpg.md - sed -i "s/.png/.jpg/g" HedgehogLinux.jpg.md - sed -i "s@/docs/logo/@/docs/images/@g" HedgehogLinux.jpg.md - sed -i "s/^# Hedgehog Linux$//" HedgehogLinux.jpg.md - sed -i 's/\!\[.*\](.*\/badge.svg)//g' HedgehogLinux.jpg.md - pandoc -s --self-contained --metadata title="Hedgehog Linux" --css doc.css -o HedgehogLinux.html HedgehogLinux.jpg.md - rm -f HedgehogLinux.jpg.md - popd >/dev/null 2>&1 - mkdir -p ./config/includes.chroot/usr/share/doc/hedgehog - cp "$SCRIPT_PATH/"*.html ./config/includes.chroot/usr/share/doc/hedgehog/ mkdir -p ./config/includes.chroot/usr/share/fonts/truetype/ubuntu/ ./config/includes.chroot/usr/share/images/hedgehog/ ./config/includes.chroot/usr/share/images/desktop-base/ cp "$SCRIPT_PATH/docs/logo/"*.png ./config/includes.chroot/usr/share/images/hedgehog/ ln -r -s ./config/includes.chroot/usr/share/images/hedgehog/*wallpaper*.png ./config/includes.chroot/usr/share/images/desktop-base/