Compare commits

..

4 Commits

Author SHA1 Message Date
MassiveAtoms
6e99404134 mend
rm a file
2021-03-05 10:33:29 -03:00
MassiveAtoms
7b033454b3 nginx unit works 2021-03-05 10:32:42 -03:00
MassiveAtoms
f34200901e i give up 2021-03-02 00:31:38 -03:00
MassiveAtoms
330a36556c static file issue, otherwise working 2021-03-02 00:09:15 -03:00
15 changed files with 167 additions and 236 deletions

3
.gitignore vendored
View File

@ -3,7 +3,8 @@ settings.json
db.sqlite3 db.sqlite3
dummyusers.json dummyusers.json
*.prof *.prof
statictest.txt
./test.sh
# IDE # IDE
.vscode .vscode

View File

@ -23,9 +23,10 @@ with open(BASE_DIR + "/settings.json", "r") as userfile:
CALIBRE_DIR = os.path.abspath(usersettings["CALIBRE_DIR"]) CALIBRE_DIR = os.path.abspath(usersettings["CALIBRE_DIR"])
SECRET_KEY = usersettings["SECRET_KEY"] SECRET_KEY = usersettings["SECRET_KEY"]
ALLOWED_HOSTS = usersettings["ALLOWED_HOSTS"] ALLOWED_HOSTS = usersettings["ALLOWED_HOSTS"]
INTERNAL_IPS = usersettings["INTERNAL_IPS"]
DEBUG = usersettings["DEBUG"] DEBUG = usersettings["DEBUG"]
DOCKER = os.environ.get('AM_DOCKER_INSTANCE', False)
# Build paths inside the project like this: os.path.join(BASE_DIR, ...) # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@ -64,38 +65,41 @@ STATIC_ROOT = BASE_DIR + "/static/"
######################################################################### #########################################################################
# LOGGING # LOGGING
# TODO: think about the issue for a bit. no write access to file on first run
# but startscript doesn't run to give access if it can't start django
logfile = usersettings["LOGFOLDER"] + "django.log" # if not DOCKER:
LOGGING = { # logfile = "/app//data//django.log"
"version": 1, # if not os.path.isfile(logfile):
"disable_existing_loggers": False, # os.mknod(logfile)
"root": {"level": "INFO", "handlers": ["file"]}, # LOGGING = {
"handlers": { # "version": 1,
"file": { # "disable_existing_loggers": False,
"level": "INFO", # "root": {"level": "INFO", "handlers": ["file"]},
"class": "logging.FileHandler", # "handlers": {
"filename": logfile, # "file": {
"formatter": "app", # "level": "INFO",
}, # "class": "logging.FileHandler",
}, # "filename": logfile,
"loggers": { # "formatter": "app",
"django": { # },
"handlers": ["file"], # },
"level": "INFO", # "loggers": {
"propagate": True # "django": {
}, # "handlers": ["file"],
}, # "level": "INFO",
"formatters": { # "propagate": True
"app": { # },
"format": ( # },
u"%(asctime)s [%(levelname)-8s] " # "formatters": {
"(%(module)s.%(funcName)s) %(message)s" # "app": {
), # "format": (
"datefmt": "%Y-%m-%d %H:%M:%S", # u"%(asctime)s [%(levelname)-8s] "
}, # "(%(module)s.%(funcName)s) %(message)s"
}, # ),
} # "datefmt": "%Y-%m-%d %H:%M:%S",
# },
# },
# }
## ## ## ##
@ -140,6 +144,7 @@ INSTALLED_APPS = [
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
"library", "library",
"django_extensions"
# "silk", # DEBUG/profilling purposes # "silk", # DEBUG/profilling purposes
# 'debug_toolbar', # DEBUG purposes # 'debug_toolbar', # DEBUG purposes
] ]
@ -189,19 +194,23 @@ WSGI_APPLICATION = 'CalibreWebCompanion.wsgi.application'
## DATBASE ## ## DATBASE ##
# https://docs.djangoproject.com/en/3.0/ref/settings/#databases # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
if usersettings["ISDOCKER"]:
defaultdb_path = "/usr/src/app/data/" if DOCKER:
djangodb_path = "/app/CalibreWebCompanion"
calibredb_path = "/app/content/"
else: else:
defaultdb_path = BASE_DIR djangodb_path = BASE_DIR
calibredb_path = CALIBRE_DIR
DATABASES = { DATABASES = {
'default': { 'default': {
'ENGINE': 'django.db.backends.sqlite3', 'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(defaultdb_path, 'db.sqlite3'), 'NAME': os.path.join(djangodb_path, 'db.sqlite3'),
}, },
'calibre': { 'calibre': {
'ENGINE': 'django.db.backends.sqlite3', 'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(CALIBRE_DIR, 'metadata.db'), 'NAME': os.path.join(calibredb_path, 'metadata.db'),
} }
} }

View File

@ -1,33 +0,0 @@
import multiprocessing
import os
import json
bind = "127.0.0.1:8000"
workers = multiprocessing.cpu_count() * 2 + 1
preload_app = True # By preloading an application you can save some RAM resources as well as speed up server boot times
keepalive = 5
# daemon = True # Detaches the server from the controlling terminal and enters the background. disabled for now
# logging
with open("settings.json", "r") as jfile:
settings = json.load(jfile)
errorlog = settings["LOGFOLDER"] + "/gunicorn_error.log"
loglevel = "warning"
accesslog = settings["LOGFOLDER"] + "/gunicorn_access.log"
if not os.path.isdir("/usr/src/app/data/logs"):
os.mkdir("/usr/src/app/data/logs")
if not os.path.isfile(errorlog):
os.system('touch {}'.format(errorlog))
if not os.path.isfile(accesslog):
os.system('touch {}'.format(accesslog))
capture_output = True
# debug settings which need to be commented out in prod
# reload=True
# reload_engine = "inotify"
# I only went till the section https://docs.gunicorn.org/en/latest/settings.html#logging there are more settings
# some of them might be useful

View File

@ -6,7 +6,7 @@
<div class="col s12 m7"> <div class="col s12 m7">
<div class="card z-depth-0 horizontal"> <div class="card z-depth-0 horizontal">
<div class="card-image"> <div class="card-image">
<a style="padding-top:15%" href=" /download/{{download}}"><img src=" /download/{{imgpath}}" <a style="padding-top:15%" href=" /content/{{download}}"><img src=" /content/{{imgpath}}"
alt="download" srcset=""></a> alt="download" srcset=""></a>
</div> </div>
<div class="card-stacked"> <div class="card-stacked">

View File

@ -1,15 +1,13 @@
{ {
"CALIBRE_DIR": "/usr/src/app/calibredir", "CALIBRE_DIR": "/app/content",
"LOGFOLDER" : "/usr/src/app/data/logs/",
"SECRET_KEY": "u(8^+rb%rz5hsx4v^^y(ul7g(4n7a8!db@s*9(m5cs*2_ppy8+", "SECRET_KEY": "u(8^+rb%rz5hsx4v^^y(ul7g(4n7a8!db@s*9(m5cs*2_ppy8+",
"ALLOWED_HOSTS": [ "ALLOWED_HOSTS": [
"127.0.0.1" "*"
], ],
"INTERNAL_IPS": [ "INTERNAL_IPS": [
"127.0.0.1" "127.0.0.1", "localhost"
], ],
"DEBUG" : true, "DEBUG" : false
"LOGFOLDER" : "/usr/src/app/data/logs/",
"ISDOCKER" : true
} }

View File

@ -1,29 +1,23 @@
## pull official base image ## pull official base image
FROM python:3.8.3-alpine FROM nginx/unit:1.22.0-python3.9
EXPOSE 8080 EXPOSE 80
ENV AM_DOCKER_INSTANCE Yes
## set work directory ## set work directory
WORKDIR /usr/src/app WORKDIR /app
## install dependencies ## install dependencies
RUN pip install --upgrade pip
COPY ./requirements.txt . COPY ./requirements.txt .
RUN pip install -r requirements.txt RUN pip install -r requirements.txt
RUN apk add nginx supervisor
# do nginx stuff
RUN adduser -D -g 'www' www
RUN mkdir -p /run/nginx
COPY ./deployment/nginx.conf /etc/nginx/
## copy project ## copy project
COPY ./CalibreWebCompanion ./CalibreWebCompanion COPY ./CalibreWebCompanion ./CalibreWebCompanion
copy ./deployment/startupscript.py ./
## gunicorn borks started with supervisord
COPY ./deployment/supervisord.conf /etc/
ENTRYPOINT /usr/bin/supervisord -c /etc/supervisord.conf
# perms
RUN chown -R unit:unit /app
COPY ./deployment/entrypoints/* /docker-entrypoint.d/
RUN chmod +x /docker-entrypoint.d/start.sh
# docker run --publish 8000:80 \ # docker run --publish 80:80 \
# -v '/home/massiveatoms/Desktop/logs:/usr/src/app/data' \ # -v '/home/MassiveAtoms/Desktop/logs:/app/data' \
# -v '/run/media/massiveatoms/1AEEEA6EEEEA421D1/Documents and Settings/MassiveAtoms/Documents/Calibre Library/:/usr/src/app/calibredir' \ # -v '/home/MassiveAtoms/windows/Users/MassiveAtoms/Documents/Calibre Library/:/app/calibredir' \
# --name cw calibreweb:1.0.1 # --name cw calibreweb:1.0

View File

@ -1,4 +0,0 @@
from os import environ

View File

@ -0,0 +1,54 @@
{
"listeners": {
"*:80": {
"pass": "routes"
}
},
"routes": [
{
"match": {
"uri": [
"/content/*",
"!~\\.db"
]
},
"action": {
"share": "/app/"
}
},
{
"match": {
"uri": "/static/*"
},
"action": {
"share": "/app/CalibreWebCompanion/"
}
},
{
"match": {
"uri": [
"!~\\.db", "*"
]
},
"action": {
"pass": "applications/django"
}
}
],
"applications": {
"django": {
"type": "python 3",
"path": "/app/CalibreWebCompanion/",
"module": "CalibreWebCompanion.wsgi",
"environment": {
"DJANGO_SETTINGS_MODULE": "CalibreWebCompanion.settings",
"DB_ENGINE": "django.db.backends.sqlite3"
},
"processes" : {
"max": 25,
"spare": 1,
"idle_timeout": 20
}
}
}
}

View File

@ -0,0 +1,22 @@
CAL_DIR="/app/content/"
DATA_DIR="/app/data/"
CWC_PATH="/app/CalibreWebCompanion"
if [ ! -d "$CAL_DIR" ]; then
echo "Calibre Library not mounted at the correct location."
echo "Mount it at /app/content/"
echo "Exiting..."
exit 1
fi
if [ ! -d "$DATA_DIR" ]; then
echo "A data directory not mounted at the correct location, exiting"
echo "This is used to store the database and logs"
echo "mount something at /app/data/"
echo "exiting"
exit 1
fi
cp -R -u -p "/app/CalibreWebCompanion/db.sqlite3" "/app/data/"
ls -l /app
python "${CWC_PATH}/manage.py" makemigrations
python "${CWC_PATH}/manage.py" migrate

View File

@ -8,12 +8,12 @@
Here's an example of step 5 Here's an example of step 5
``` ```
docker run --publish 80:80 \ docker run --publish 80:80 \
-v '/home/massiveatoms/Desktop/logs:/usr/src/app/data' \ -v '/home/MassiveAtoms/Desktop/logs:/app/data' \
-v '/run/media/massiveatoms/1AEEEA6EEEEA421D/Documents and Settings/MassiveAtoms/Documents/Calibre Library/:/usr/src/app/calibredir' \ -v '/home/MassiveAtoms/windows/Users/MassiveAtoms/Documents/Calibre\ Library/:/app/calibredir' \
--name cw calibreweb:1.0.1 --name cw calibreweb:1.0
``` ```
your Calibre path/volume/whatever needs to be mounted at `/usr/src/app/calibredir`, and you need to mount a volume for the db and logs at `/usr/src/app/data` your Calibre path/volume/whatever needs to be mounted at `/app/calibredir`, and you need to mount a volume for the db and logs at `/app/data`
Issues with it at the moment: Issues with it at the moment:
1. we still need to do something to create a random secret key. Atm, this would still 1. we still need to do something to create a random secret key. Atm, this would still

View File

@ -1,81 +0,0 @@
worker_processes 1;
# user nobody nogroup;
user www www; # TEMP disabled
# user nobody nobody; # for systems with 'nobody' as a group instead
error_log /usr/src/app/data/logs/nginx.log warn;
# pid /var/run/nginx.pid;
events {
worker_connections 1024; # increase if you have lots of clients
accept_mutex off; # set to 'on' if nginx worker_processes > 1
use epoll; # to enable for Linux 2.6+ MASSIVEATOMS
# 'use kqueue;' to enable for FreeBSD, OSX
}
http {
include mime.types;
# fallback in case we can't determine a type
default_type application/octet-stream;
access_log /var/log/nginx/access.log combined;
sendfile on;
upstream app_server {
# fail_timeout=0 means we always retry an upstream even if it failed
# to return a good HTTP response
# for UNIX domain socket setups
# server unix:/tmp/gunicorn.sock fail_timeout=0;
# for a TCP configuration
server 127.0.0.1:8000 fail_timeout=0;
}
server {
# if no Host match, close the connection to prevent host spoofing
listen 80 default_server;
return 444;
}
server {
listen 80 deferred; # for Linux massiveatoms
# use 'listen 80 accept_filter=httpready;' for FreeBSD
# listen 80;
client_max_body_size 4G;
# set the correct host(s) for your site
server_name localhost 0.0.0.0; # set this to the server url? or ip? we'll see MASSIVEATOMS
keepalive_timeout 5;
# # MASSIVEATOMS
location /download/ {
alias "/usr/src/app/calibredir/";
# Never forget the fact that this little statement being root instead of alias caused us to lose more than a day troubleshooting
}
location /static/ {
alias "/usr/src/app/CalibreWebCompanion/static/";
# Never forget the fact that this little statement being root instead of alias caused us to lose more than a day troubleshooting
}
location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
# proxy_set_header Host $http_host;
# we don't want nginx trying to do something clever with
# redirects, we set the Host: header above already.
proxy_redirect off;
proxy_pass http://127.0.0.1:8000;
}
error_page 500 502 503 504 /500.html;
location = /500.html {
root /path/to/app/current/public;
}
}
}

View File

@ -1,11 +0,0 @@
from os import system, chdir
# system("chown -R www:www /usr/src/app/calibredir")
# print("ownership of calibredir changed")
chdir("/usr/src/app/CalibreWebCompanion")
system("python ./manage.py makemigrations")
print("ran makemigrations")
system("python ./manage.py migrate")
print("migrate")

View File

@ -1,36 +0,0 @@
[supervisord]
nodaemon=true
logfile=/tmp/supervisord.log
childlogdir=/tmp
pidfile = /tmp/supervisord.pid
[program:gunicorn]
directory=/usr/src/app/CalibreWebCompanion
command=gunicorn CalibreWebCompanion.wsgi
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
autorestart=false
startretries=0
startsecs = 0
[program:nginx]
# user=www
command=nginx
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
autorestart=false
startretries=0
[program:startupscript]
directory=/usr/src/app
command=python ./startupscript.py
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
autorestart=false
startretries=0

View File

@ -1,6 +1,7 @@
django>=3.0.8 django>=3.0.8
inotify>=0.2.10 inotify>=0.2.10
gunicorn>=20.0 gunicorn>=20.0
django-extensions
# development # development
# django-debug-toolbar>=2.2 # django-debug-toolbar>=2.2
# django-silk>=4.0 # django-silk>=4.0

17
test.sh Executable file
View File

@ -0,0 +1,17 @@
docker build --tag calibreweb:1.0 . -f ./deployment/Dockerfile
docker stop cw
docker rm cw
docker run --publish 80:80 \
-v '/home/MassiveAtoms/Desktop/logs:/app/data' \
-v '/home/MassiveAtoms/windows/Users/MassiveAtoms/Documents/Calibre Library/:/app/content' \
--name cw calibreweb:1.0
sleep 8
echo "download/test"
curl -s -o /dev/null -w "%{http_code}" http://127.0.0.1/download/statictest.txt
echo " "
echo "/test"
curl -s -o /dev/null -w "%{http_code}" http://127.0.0.1/statictest.txt
echo " "
echo "/static/test"
curl -s -o /dev/null -w "%{http_code}" http://127.0.0.1/static/statictest.txt
echo " "