diff options
| author | nico <nico@magicbroccoli.de> | 2020-04-19 13:11:17 +0200 |
|---|---|---|
| committer | nico <nico@magicbroccoli.de> | 2020-04-19 13:11:17 +0200 |
| commit | c8da6d2f2d530ea51ec0dee937d1309fb57d824f (patch) | |
| tree | cc1943c34da559ee916a78adeef0d09b0f137a23 | |
| parent | 36cf666a0c8ea32c702338e2931dc109859269a7 (diff) | |
add missing requirements and config parameters
+ add missing config parameters in the config template
+ add redis requirement
* fixed mistake in the uwsgi template
| -rw-r--r-- | config-default.yml | 10 | ||||
| -rw-r--r-- | requirements.txt | 1 | ||||
| -rw-r--r-- | static/joplinapi.uwsgi.ini | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/config-default.yml b/config-default.yml index 9467e64..56b0642 100644 --- a/config-default.yml +++ b/config-default.yml @@ -1,11 +1,17 @@ { + # flask settings "secret-key": "super-secret-password", "flask-secret": "different-super-secret-password", - "cookie_domain": ".example.de/joplin", "cookie_path": "/joplin/", + # joplin "htpasswd_file": "/path/to/joplin/htauth/file", "joplin_webdav_dir": "/var/www/webdav/joplin", - "invite_code": "secret invite code" + "invite_code": "secret invite code", + + # cache + 'cache_type': 'redis', + 'cache_key_prefix': 'FLASK:', + 'cache_redis_url': 'redis://localhost:6379/0' }
\ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 5cf7beb..76fe1b0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,3 +5,4 @@ Flask-Caching==1.8.0 Markdown==3.2.1 ruamel.yaml==0.16.10 ruamel.yaml.clib==0.2.0 +redis==3.4.1 diff --git a/static/joplinapi.uwsgi.ini b/static/joplinapi.uwsgi.ini index 84f3128..f626e34 100644 --- a/static/joplinapi.uwsgi.ini +++ b/static/joplinapi.uwsgi.ini @@ -5,11 +5,11 @@ base = /var/www chdir = %(base)/%(project) home = %(base)/%(project)/venv -module = joplinapi:app +module = app:app plugins = python3 manage-script-name = true -processes = 3 +processes = 1 uid = www-data gid = www-data logto = /var/log/uwsgi/app/%(project).log |