diff --git a/README.md b/README.md index 2e392fc..87a2f92 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,26 @@ On django: #apt install grub2-common net-tools openssh-server gnupg virtualenv git-core libmysqlclient-dev gcc python-dev python3-dev - + /etc/systemd/system/uwsgi.service +~~~~ +[Unit] +Description=uWSGI instance to serve sinnes-tau + +[Service] +User = www-data +Group = www-data +#WorkingDirectory=/srv/www/sinnes-tau/server/ +#Environment="PATH=/srv/www/sinnes-tau/server/var/www/flaskapp/venv/bin" +#ExecStart=/var/www/flaskapp/venv/bin/uwsgi --ini myproject.ini + +ExecStartPre=-/usr/bin/bash -c 'mkdir -p /run/uwsgi; chown www-data:www-data /run/uwsgi' +#ExecStart=/usr/bin/bash -c 'cd /srv/www/sinnes-tau; source venv3/bin/activate; cd server;uwsgi --socket 127.0.0.1:8081 --wsgi-file sinnestau/wsgi.py --uid=www-data --gid=www-data' +ExecStart=/usr/bin/bash -c 'cd /srv/www/sinnes-tau; source venv3/bin/activate; cd server;uwsgi --socket 127.0.0.1:8081 --wsgi-file sinnestau/wsgi.py' +[Install] +WantedBy=multi-user.target +~~~~ + + systemctl daemon-reload Peter Kuntner 2021 diff --git a/hpst/static/img/favicon.ico b/hpst/static/img/favicon.ico new file mode 100644 index 0000000..761c6f5 Binary files /dev/null and b/hpst/static/img/favicon.ico differ diff --git a/hpst/templates/index.html b/hpst/templates/index.html index b60c9a3..d834988 100644 --- a/hpst/templates/index.html +++ b/hpst/templates/index.html @@ -204,7 +204,7 @@ Ziel ist eine Anregung zur Selbstreflektion und die Überwindung von Konflikten. {% empty %}
  • - Image + Image Zur Zeit keine Termin
    • {% endfor %} @@ -315,7 +315,7 @@ Kronach / Fischbach
    Phone: 0152/21700463
    Email: info@sinnes-tau.de
    -

    Swing by for a cup of , or leave me a note:

    +

    Komme auf eine Tasse vorbei, oder hinterlasse mir eine Nachricht:

    diff --git a/hpst/templates/st_base.html b/hpst/templates/st_base.html index 2eab2e9..c712c2b 100644 --- a/hpst/templates/st_base.html +++ b/hpst/templates/st_base.html @@ -6,10 +6,10 @@ - + - +
    @@ -113,6 +113,25 @@ function openCity(evt, cityName) { evt.currentTarget.classList.add("w3-light-grey"); } + + + diff --git a/sinnestau/settings.py b/sinnestau/settings.py index 5fc1c38..4dfbc13 100644 --- a/sinnestau/settings.py +++ b/sinnestau/settings.py @@ -12,6 +12,7 @@ https://docs.djangoproject.com/en/3.2/ref/settings/ from pathlib import Path + # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -133,3 +134,4 @@ STATIC_ROOT = str(BASE_DIR.joinpath('build/static')) # https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' +