Merge remote-tracking branch 'upstream/master' into feature/qr-button…

…-my-stuff

.github/workflows/build-and-test.yml

@@ -71,7 +71,7 @@ jobs:
       - name: "Set up PostgreSQL"
         uses: harmon758/postgresql-action@v1
         with:
-          postgresql version: '9.6'  # minimum NAV requirement
+          postgresql version: '11'  # minimum NAV requirement
           postgresql user: $PGUSER
           postgresql password: $PGPASSWORD
 

NOTES.rst

@@ -8,6 +8,15 @@ existing bug reports, go to https://github.com/uninett/nav/issues .
 To see an overview of upcoming release milestones and the issues they resolve,
 please go to https://github.com/uninett/nav/milestones .
 
+NAV 5.10 (Unreleased)
+=====================
+
+Dependency changes
+------------------
+
+.. IMPORTANT:: NAV 5.10 requires PostgreSQL to be at least version *11*.
+
+
 NAV 5.9
 =======
 

changelog.d/+pg11.changed

@@ -0,0 +1 @@
+Changed required PostgreSQL version to 11

doc/howto/generic-install-from-source.rst

@@ -27,7 +27,7 @@ Runtime requirements
 To run NAV, these software packages are required:
 
  * Apache2 + mod_wsgi (or, really, any web server that supports the WSGI interface)
- * PostgreSQL >= 9.6 (With the ``hstore`` extension available)
+ * PostgreSQL >= 11 (With the ``hstore`` extension available)
  * :xref:`Graphite`
  * Python >= 3.7.0
  * nbtscan = 1.5.1

docker-compose.yml

@@ -77,7 +77,7 @@ services:
     restart: on-failure:5
 
   postgres:
-    image: "postgres:9.6"
+    image: "postgres:13"
     environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
     restart: on-failure:5

tools/docker/full-nav-restore.sh

@@ -10,7 +10,7 @@ if ! which navsyncdb 2>/dev/null; then
     echo "NAV source directory not correctly mounted on /source" > /dev/stderr
     exit 1
 fi
-nav stop
+sudo nav stop
 export PGHOST=postgres
 export PGUSER=postgres