Merge pull request #4 from iritmaximus/main

Small fixes after rereleasing to server

.gitignore

@@ -1,5 +1,6 @@
 .env
 *.pyc
 __pycache__
+.venv
 venv
 **/.DS_Store

README.md

@@ -0,0 +1,33 @@
+# Sossu flask
+This is the sossu's main page.
+
+## Running
+To run this on this server, one should just start the systemd service sossu-flask.service with
+the command 
+```bash
+systemctl start sossu-flask.service
+```
+
+There exists a symlink from `sossunVerkkosivut/sossu-flask.service -> /etc/systemd/system/sossu-flask.service`.
+The systemd service file waits for network connectivity before starting and should be enabled by default to run
+after system rebooting or on failure.
+
+If systemd service is not needed the app can be run by 
+```bash
+python wsgi.py
+```
+
+
+## Virtual environment
+If one needs to update the `pip` packages or something else to do with such things, there exists a virtual env
+at `.venv`. If that does not exist, create it with `python -m venv .venv`
+
+After that you need to activate it with (in linux at least)
+```bash
+source .venv/bin/activate
+```
+
+Then you can install the required packages with
+```bash
+pip install -r requirements.txt
+```

sossu-flask.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Python flask app running the sossu main page.
+
+[Service]
+# disables output buffering -> logging works correctly
+Environment=PYTHONUNBUFFERED=1
+Restart=on-failure
+# checks network connectivity before launching
+ExecStartPre=/bin/sh -c 'while ! ping -c1 1.1.1.1 -W.5; do sleep 1; done'
+# executes the site
+ExecStart=/root/sossunVerkkosivut/.venv/bin/python3 /root/sossunVerkkosivut/wsgi.py
+
+[Install]
+WantedBy=multi-user.target

templates/tule_mukaan.html

@@ -28,7 +28,7 @@
 </p>
 <p>
   Laulamaan mieliville suosittelemme sisaruskuoroamme
-  <a class="textlink" href="http://sol.savolainenosakunta.fi/" target="_blank" rel="noopener noreferrer">Savolaisen osakunnan kuoroa (SOL)</a>,
+  <a class="textlink" href="https://solkuoro.fi" target="_blank" rel="noopener noreferrer">Savolaisen osakunnan kuoroa (SOL)</a>,
   jonka kanssa meillä on pitkät yhteiset keikkailuperinteet.
 </p>
 <h3>Miten jäseneksi?</h3>

wsgi.py

@@ -1,4 +1,4 @@
 from app import app
 
 if __name__ == "__main__":
-    app.run()
+    app.run(host=127.0.0.1, port=5000)