Skip to content

Commit

Permalink
Merge branch 'fileops' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
vgarcia007 authored Sep 24, 2024
2 parents 8c56a62 + 99d08f9 commit 953a031
Show file tree
Hide file tree
Showing 51 changed files with 1,392 additions and 378 deletions.
9 changes: 2 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,8 @@ EXPOSE 54925
EXPOSE 54921
EXPOSE 80

#ADD files/gui/index.php /var/www/html
#ADD files/gui/main.css /var/www/html
#ADD files/api/scan.php /var/www/html
#ADD files/api/active.php /var/www/html
#ADD files/api/list.php /var/www/html
#ADD files/api/download.php /var/www/html
COPY html /var/www/html
# Copy the web files to the web directory
COPY www /var/www
RUN chown -R www-data /var/www/
#directory for scans:
VOLUME /scans
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ You can configure the tool via environment variables:
| USE_JPEG_COMPRESSION | optional | use JPEG compression when creating PDFs |
| TELEGRAM_TOKEN | optional | If TELEGRAM_TOKEN and TELEGRAM_CHATID are set, then this sends notification |
| TELEGRAM_CHATID | optional | If TELEGRAM_TOKEN and TELEGRAM_CHATID are set, then this sends notification |
| ALLOW_GUI_FILEOPERATIONS | optional | true/false. Let you delete and rename files in files list |
### FTPS upload
Expand Down
1 change: 1 addition & 0 deletions docker-compose-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ services:
- OCR_PATH=ocr.php
- TELEGRAM_TOKEN="" # note: keep the word bot in the string
- TELEGRAM_CHATID=127585497 # note: target chat id. can be person or group
- ALLOW_GUI_FILEOPERATIONS=true
restart: unless-stopped

# optional, for OCR
Expand Down
12 changes: 12 additions & 0 deletions files/runScanner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ echo "-----"

echo "setting up webserver:"
if [ "$WEBSERVER" == "true" ]; then

echo "starting webserver for API & GUI..."
{
echo "<?php"
Expand Down Expand Up @@ -95,6 +96,17 @@ if [ "$WEBSERVER" == "true" ]; then
sed -i "s/server.port\W*= 80/server.port = $PORT/" /etc/lighttpd/lighttpd.conf
/usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf
echo "webserver started"

# Rewrite-Regeln zur Lighttpd-Konfiguration hinzufügen
cat <<EOL >> /etc/lighttpd/lighttpd.conf
server.modules += ( "mod_rewrite" )
url.rewrite-if-not-file = (
"^/(.*)$" => "/index.php"
)
EOL
else
echo "webserver not configured"
fi
Expand Down
23 changes: 0 additions & 23 deletions html/download.php

This file was deleted.

231 changes: 0 additions & 231 deletions html/index.php

This file was deleted.

55 changes: 0 additions & 55 deletions html/list.php

This file was deleted.

Loading

0 comments on commit 953a031

Please sign in to comment.