aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-x.gitignore6
-rwxr-xr-xdocker-compose.yml2
-rw-r--r--edaweb/services.py2
-rw-r--r--edaweb/static/images/random.jpgbin202536 -> 243734 bytes
-rw-r--r--entrypoint.sh4
5 files changed, 8 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 087b0b3..5cb2818 100755
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,10 @@
*.pub
homelab-wiki/wiki.env
homelab-wiki/images/*
-edaweb.conf
+*edaweb.conf
markdowns/
-static/images/random.jpg
-static/zips/*.zip
+*random.jpg
+*.zip
.nfs*
static/images/Thumbs.db
nitter/nitter.conf
diff --git a/docker-compose.yml b/docker-compose.yml
index 67976bf..ecfa9f9 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
volumes:
- /tmp/:/media/ISOs/
- ./edaweb/static/:/app/edaweb/static/
- - ./edaweb.conf:/app/edaweb/edaweb.conf
+ - ./edaweb.conf:/app/edaweb.conf
- ./edaweb-docker.pem:/keys/docker-key.pem
ports:
- "6969:6969"
diff --git a/edaweb/services.py b/edaweb/services.py
index 14d7d23..eca2bde 100644
--- a/edaweb/services.py
+++ b/edaweb/services.py
@@ -247,7 +247,7 @@ def parse_tweet(tweet_url):
return dt, replying_to, text, images
-def scrape_whispa(whispa_url):
+def scrape_whispa(whispa_url, since = None):
tree = html.fromstring(requests.get(whispa_url).content.decode())
qnas = []
# we're not doing proper HTML scraping here really... since the site uses client side rendering
diff --git a/edaweb/static/images/random.jpg b/edaweb/static/images/random.jpg
index 4e23beb..882d704 100644
--- a/edaweb/static/images/random.jpg
+++ b/edaweb/static/images/random.jpg
Binary files differ
diff --git a/entrypoint.sh b/entrypoint.sh
index 335ad66..70d7b26 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,3 +1,5 @@
+rm -rvf /app/edaweb/edaweb.conf/
+ln -s /app/edaweb.conf /app/edaweb/edaweb.conf
printenv | grep -v "no_proxy" >> /etc/environment
tmux new-session -d -s "cron" 'cron -f || bash && bash';
-python3 /app/edaweb/app.py --production \ No newline at end of file
+python3 /app/edaweb/app.py --production