tuomas777 · tuomas777 · Nov 5, 2024 · Nov 5, 2024 · Nov 5, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,16 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  common:
+    uses: tuomas777/.github/.github/workflows/ci-django-api.yml@reusable_workflow_precommit
+    secrets: inherit
+    with:
+      python-version: 3.9
+      postgres-major-version: 14
+      use-postgis: true
diff --git a/.gitignore b/.gitignore
@@ -51,4 +51,4 @@ config_dev.toml
 protected_media/
 media/
 .vscode
-.python-version
+.python-version
diff --git a/.tx/config b/.tx/config
@@ -7,4 +7,3 @@ source_file = democracy/locale/django.pot
 source_lang = en
 trans.fi = democracy/locale/fi/LC_MESSAGES/django.po
 type = PO
-
diff --git a/api_urls_draft.md b/api_urls_draft.md
@@ -8,7 +8,7 @@ Language used as GET parameter anywhere
  - send #26
 
 ## /account
- 
+
  - register #9
  - update user info #11
 
@@ -152,4 +152,3 @@ List labels. Get detail. Create, update.
 
  - **list** _/api/v1/labels/?hearing=[hearingID]_
  - **CRUD** #23 _/api/v1/labels/[labelID]_
-
diff --git a/democracy/locale/fi/LC_MESSAGES/django.po b/democracy/locale/fi/LC_MESSAGES/django.po
@@ -1,7 +1,7 @@
 # Translations template for PROJECT.
 # Copyright (C) 2016 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# 
+#
 # Translators:
 # Aarni Koskela, 2015-2016
 # Tuomas Haapala <[email protected]>, 2016
@@ -254,4 +254,4 @@ msgid "multiple-choice"
 msgstr "monivalintakysymys"
 
 msgid "total answers"
-msgstr "vastauksia yhteensä"
+msgstr "vastauksia yhteensä"
diff --git a/democracy/static/admin/select2/select2.min.js b/democracy/static/admin/select2/select2.min.js
diff --git a/deploy/entrypoint.sh b/deploy/entrypoint.sh
@@ -24,5 +24,5 @@ elif [[ "$DEV_SERVER" = "true" ]]; then
     exec python -Wd ./manage.py runserver 0.0.0.0:8000
 else
     echo "Starting production server"
-    exec uwsgi -y deploy/uwsgi.yml
+    exec uwsgi -ini deploy/uwsgi.ini
 fi
diff --git a/deploy/uwsgi.ini b/deploy/uwsgi.ini
@@ -0,0 +1,22 @@
+[uwsgi]
+# Needed plugins if running against Debian uwsgi-package
+# python docker image cannot use that due to linker mishaps
+wsgi-file = kerrokantasi/wsgi.py
+processes = 3
+#threads = 1
+master = true
+umask = 022
+reload-on-rss = 300
+
+# Allow large image uploads
+#chunked-input-limit = 10485760
+buffer-size = 32768
+
+http = :8000
+static-map = /static=/srv/static
+static-map = /media=/srv/media
+
+# Ignore write errors
+ignore-sigpipe = true
+ignore-write-errors = true
+disable-write-exception = true
diff --git a/deploy/uwsgi.yml b/deploy/uwsgi.yml
diff --git a/deploy/wait-for-it.sh b/deploy/wait-for-it.sh
@@ -179,4 +179,4 @@ if [[ $WAITFORIT_CLI != "" ]]; then
     exec "${WAITFORIT_CLI[@]}"
 else
     exit $WAITFORIT_RESULT
-fi
+fi
diff --git a/docs/pull_request_template.md b/docs/pull_request_template.md
@@ -8,21 +8,21 @@
 ### Breakdown:
 
 #### Kategoria-otsikko
- 1. Tiedosto 
+ 1. Tiedosto
      * Selitys muutoksista
-   
+
  2. Tiedosto
      * Selitys muutoksista
-    
+
  3. Tiedosto
      * Selitys muutoksista
-     
+
 #### Kategoria-otsikko
- 1. Tiedosto 
+ 1. Tiedosto
      * Selitys muutoksista
-   
+
  2. Tiedosto
      * Selitys muutoksista
-    
+
  3. Tiedosto
       * Selitys muutoksista
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,3 @@ source_file = democracy/locale/django.pot
		source_lang = en
		trans.fi = democracy/locale/fi/LC_MESSAGES/django.po
		type = PO
-Original file line number
+Diff line change
@@ Expand Up / @@ -179,4 +179,4 @@ if [[ $WAITFORIT_CLI != "" ]]; then @@
         exec "${WAITFORIT_CLI[@]}"
     else
         exit $WAITFORIT_RESULT
-    fi
+    fi