Fix merge conflict

amyburness · Dec 10, 2021 · 49aadab · 49aadab
1 parent 3bece7e
commit 49aadab
Show file tree

Hide file tree

Showing 60 changed files with 2,604 additions and 314 deletions.
diff --git a/conf/qgis_conf/README.md b/conf/qgis_conf/README.md
@@ -7,24 +7,18 @@ Make sure to copy over the authdb whenever you change it e.g.
 
 sudo cp ~/.local/share/QGIS/QGIS3/profiles/Smallholding/qgis-auth.db qgis_conf/
 
+Or more conveniently copy it into the filebrowser web file manager.
+
 These files must be writable by the nginx user in the container. See 
 below:
 
-sudo chown 33:33 qgis_conf/qgis*
+sudo chown 33:33 qgis_conf/auth-db-password/qgis*
+sudo chown 33:33 qgis_conf/auth-db/qgis*
 docker-compose exec qgis-server ls -lah /tmp
 
-total 84K
-drwxrwxrwt 1 root     root     4.0K Feb 10 13:13 .
-drwxr-xr-x 1 root     root     4.0K Feb 10 13:13 ..
-drwxrwxrwt 2 root     root     4.0K Feb 10 13:13 .X11-unix
--r--r--r-- 1 root     root       11 Feb 10 13:13 .X99-lock
-drwx------ 2 www-data www-data 4.0K Feb 10 13:13 QGIS3-XpIBVC
--rw-r--r-- 1 www-data www-data    0 Feb 10 13:13 QGIS3.BCjd13
-drwx------ 2 root     root     4.0K Jan 18 06:56 crssync-tb3mKp
--rw-rw-r-- 1 www-data www-data    8 Feb 10 00:39 qgis-auth-pwd.txt
--rw-r--r-- 1 www-data www-data  44K Feb  9 18:08 qgis-auth.db
-drwx------ 2 www-data www-data 4.0K Feb 10 13:13 qgis_mapserv.fcgi-htBxsD
-drwx------ 2 www-data www-data 4.0K Feb 10 13:13 runtime-www-data
-drwx------ 2 root     root     4.0K Jan 18 06:53 tmp4q9bqd_o
+
+auth-db-password/qgis-auth-pwd.txt
+auth-db/qgis-auth.db
+
 
 Also make sure to restart docker containers after changing this.
diff --git a/conf/qgis_conf/qgis-auth-pwd.txt → conf/qgis_conf/auth-db/qgis-auth-pwd.txt b/conf/qgis_conf/qgis-auth-pwd.txt → conf/qgis_conf/auth-db/qgis-auth-pwd.txt
diff --git a/conf/qgis_conf/qgis-auth.db → conf/qgis_conf/auth-db/qgis-auth.db b/conf/qgis_conf/qgis-auth.db → conf/qgis_conf/auth-db/qgis-auth.db
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -199,9 +199,15 @@ services:
      - ./conf/mapproxy_conf/seed.yaml:/files/mapproxy/seed.yaml
      - ./conf/mapproxy_conf/mapproxy.yaml:/files/mapproxy/mapproxy.yaml
      - ./conf/mapproxy_conf/clip:/files/mapproxy/clip
-     # Nore red data
+     # Node red data
      - node-red-data:/files/node_red__data
+<<<<<<< HEAD
     user: 1000:1000
+=======
+     # Pg config data
+     - ./conf/pg_conf:/files/postgres_config
+    user: root # FIXME
+>>>>>>> 65b7965 (Doc updates)
     networks:
      - os-gis-stack
     restart: unless-stopped

diff --git a/docs/_sources/services/docker-osm.md.txt b/docs/_sources/services/docker-osm.md.txt
@@ -1,4 +1,4 @@
-# Docker OSM mirror 
+# Docker OSM mirror - PR
 
 OpenStreetMap (OSM) is a digital map database of the world built through crowdsourced volunteered geographic information. The data from OSM is freely available for visualization, query, download, and modification under [open licenses](https://www.openstreetmap.org/copyright). [[1]](#1) OSM can also be described as a free, editable map of the whole world [[2]](#2).
 

diff --git a/docs/_sources/services/filebrowser.md.txt b/docs/_sources/services/filebrowser.md.txt
@@ -0,0 +1 @@
+# File Browser
diff --git a/docs/_sources/services/geoserver.md.txt b/docs/_sources/services/geoserver.md.txt
@@ -1,4 +1,4 @@
-# GeoServer
+# GeoServer - PR
 
 GeoServer is a Java-based server, built on [GeoTools](https://geotools.org/),  that allows users to view and edit geospatial data, using the open standards set forth by the [Open Geospatial Consortium (OGC)](http://www.opengeospatial.org/). By implementing the [Web Map Service (WMS)](https://www.ogc.org/standards/wms) standard, GeoServer can create maps in a variety of output formats. GeoServer also conforms to the [Web Feature Service (WFS)](https://www.ogc.org/standards/wfs) standard, and [Web Coverage Service (WCS)](https://www.ogc.org/standards/wcs) standard which permits the sharing and editing of the data that is used to generate the maps. GeoServer also uses the [Web Map Tile Service](https://www.ogc.org/standards/wmts) standard to split your published maps into tiles for ease of use by web mapping and mobile applications.  [OpenLayers](https://openlayers.org/), a free mapping library, is integrated into GeoServer, making map generation quick and easy. GeoServer is a modular application with additional functionality added via extensions.[[1]](#1)
 

diff --git a/docs/_sources/services/hugo-watcher.md.txt b/docs/_sources/services/hugo-watcher.md.txt
@@ -1,4 +1,4 @@
-# Hugo Watcher
+# Hugo Watcher - PR
 
 Hugo is a static site generator. Hugo builds pages when you create or update your content. Since websites are viewed far more often than they are edited, Hugo is designed to provide an optimal viewing experience for the website’s end users and an ideal writing experience for website authors. [[1]](#1)
 

diff --git a/docs/_sources/services/index.rst.txt b/docs/_sources/services/index.rst.txt
@@ -1,19 +1,28 @@
 Services
 ==============================================
 
+Here follows the list of services that are available in the OSGS stack.
+
+* Items with a (PR) suffix can be considered production ready.
+* Items with a (WIP) suffix can be considered a work in progress.
+
 .. toctree::
    :maxdepth: 1
    :caption: Contents:
 
+   nginx
+   filebrowser
+   hugo-watcher
    postgres
+   qgis-server
    geoserver
-   hugo-watcher
    docker-osm
+   node-red
+   jupyter
+   postgrest
+   swagger
+   scp
    lizmap
    mergin-server
    mergin-client
    mergin-db-sync
-   nginx
-   postgrest
-   qgis-server
-   scp
diff --git a/docs/_sources/services/jupyter.md.txt b/docs/_sources/services/jupyter.md.txt
@@ -0,0 +1,5 @@
+# Jupyter Notebook  - PR
+
+<div class="admonition warning">
+Note - this service does not support multi-user collaboration yet. In the future we will add Jupyter Hub to support this.
+</div>
diff --git a/docs/_sources/services/lizmap.md.txt b/docs/_sources/services/lizmap.md.txt
@@ -1,4 +1,8 @@
-# Lizmap
+# Lizmap - WIP
+
+<div class="admonition warning">
+Note - this service is under development and not production ready yet.
+</div>
 
 Lizmap is an open source software designed by 3Liz that allows QGIS® Desktop to create Web map applications. [[1]](#1)  
 

diff --git a/docs/_sources/services/mergin-client.md.txt b/docs/_sources/services/mergin-client.md.txt
@@ -1,4 +1,8 @@
-# Mergin Client
+# Mergin Client - WIP
+
+<div class="admonition warning">
+Note - this service is under development and not production ready yet.
+</div>
 
 This tool will synchronise a Mergin cloud project into a PostgreSQL project.
 

diff --git a/docs/_sources/services/mergin-db-sync.md.txt b/docs/_sources/services/mergin-db-sync.md.txt
@@ -1,4 +1,9 @@
-# Mergin-db-sync
+# Mergin-db-sync - PR
+
+
+<div class="admonition warning">
+Note - this service only supports one synchronised Mergin project. 
+</div>
 
 There are two modalities in which you can work with Mergin projects:
 

diff --git a/docs/_sources/services/mergin-server.md.txt b/docs/_sources/services/mergin-server.md.txt
@@ -1,4 +1,8 @@
-# Mergin Server
+# Mergin Server - WIP
+
+<div class="admonition warning">
+Note - this service is under development and not production ready yet.
+</div>
 
 Mergin is a web platform for storage and synchronisation of geospatial projects across multiple users and devices (desktop and mobile).The platform is especially useful when you need: 
 
@@ -85,4 +89,4 @@ make restore-mergin-server-sql
 
 ## References
 
-<a id="1">[1]</a> Lutra Consulting. (n.d.). GitHub - lutraconsulting/mergin: Store and track changes to your geo-data. GitHub. Retrieved August 26, 2021, from https://github.com/lutraconsulting/mergin
+<a id="1">[1]</a> Lutra Consulting. (n.d.). GitHub - lutraconsulting/mergin: Store and track changes to your geo-data. GitHub. Retrieved August 26, 2021, from https://github.com/lutraconsulting/mergin
diff --git a/docs/_sources/services/nginx.md.txt b/docs/_sources/services/nginx.md.txt
@@ -1,4 +1,4 @@
-# Nginx
+# Nginx - PR
 
 Nginx is a lightweight web server acting as a proxy in front of QGIS server, and as a server for the static HTML content.
 
@@ -24,4 +24,4 @@ Nginx is a lightweight web server acting as a proxy in front of QGIS server, and
 
 ## Accessing the running services
 
-## Additional Notes
+## Additional Notes
diff --git a/docs/_sources/services/node-red.md.txt b/docs/_sources/services/node-red.md.txt
@@ -0,0 +1 @@
+# Node Red - PR
diff --git a/docs/_sources/services/postgres.md.txt b/docs/_sources/services/postgres.md.txt
@@ -1,4 +1,4 @@
-# Postgres and PostGIS
+# Postgres and PostGIS - PR
 
 PostgreSQL is a powerful, open source object-relational database management system  (ORDBMS) that uses and extends the SQL language combined with many features that safely store and scale the most complicated data workloads.[[1]](#1)[[2]](#2)
 

diff --git a/docs/_sources/services/postgrest.md.txt b/docs/_sources/services/postgrest.md.txt
@@ -1,4 +1,4 @@
-# PostgREST
+# PostgREST - PR
 
 PostgREST is a standalone web server that turns your PostgreSQL database directly into a RESTful API. The structural constraints and permissions in the database determine the API endpoints and operations. [[1]](#1) The PostgREST service ion the OSGS platform is used for pushing readings from IoT devices to our database.
 
@@ -28,4 +28,4 @@ PostgREST is a standalone web server that turns your PostgreSQL database directl
 
 ## References
 
-<a id="1">[1]</a> Nelson, J., & Chavez, S. (n.d.). PostgREST Documentation — PostgREST 8.0.0 documentation. PostgREST Documentation. Retrieved August 26, 2021, from https://postgrest.org/en/v8.0/
+<a id="1">[1]</a> Nelson, J., & Chavez, S. (n.d.). PostgREST Documentation — PostgREST 8.0.0 documentation. PostgREST Documentation. Retrieved August 26, 2021, from https://postgrest.org/en/v8.0/
diff --git a/docs/_sources/services/qgis-server.md.txt b/docs/_sources/services/qgis-server.md.txt
@@ -1,4 +1,4 @@
-# QGIS Server
+# QGIS Server - PR
 
 With the QGIS Server service you can publish one or more QGIS projects including:
     1. Projects stored in-database in PostgreSQL

diff --git a/docs/_sources/services/scp.md.txt b/docs/_sources/services/scp.md.txt
@@ -1,15 +1,22 @@
-# SCP
-
-The SCP (secure copy) containers have been arranged so that there are some standard containers out of the box. 
-Each container has its data stored in its own docker volume as well. The data is somewhat isolated 
-and there are containers for QGIS projects, fonts, SVGs that your QGIS projects might reference, 
-general file sharing, uploading data to ODM, etc. The SCP service is designed to only support 
-connections with SSH public-private key encryption and password based authentication. The way 
-that you provision users into it is that you copy the SSH public key into a file in the configuration 
-folder for SCP and then that user will be allowed to make the connection to whichever SCP share 
-that you have created for them. The SCP container can be used to copy a QGIS project file from your 
-desktop up to the server with all the QGIS resources that it needs such as shapefiles. The QGIS 
-Server instance can then be used to access the project from the OGC web services.
+# SCP - PR
+
+<div class="admonition warning">
+Note - with the provision of the filebrowser service, we will probably deprecate this service.
+</div>
+
+The SCP (secure copy) containers have been arranged so that there are some
+standard containers out of the box.  Each container has its data stored in its
+own docker volume as well. The data is somewhat isolated and there are
+containers for QGIS projects, fonts, SVGs that your QGIS projects might
+reference, general file sharing, uploading data to ODM, etc. The SCP service is
+designed to only support connections with SSH public-private key encryption and
+password based authentication. The way that you provision users into it is that
+you copy the SSH public key into a file in the configuration folder for SCP and
+then that user will be allowed to make the connection to whichever SCP share
+that you have created for them. The SCP container can be used to copy a QGIS
+project file from your desktop up to the server with all the QGIS resources
+that it needs such as shapefiles. The QGIS Server instance can then be used to
+access the project from the OGC web services.
 
 
 **Project Website:**

diff --git a/docs/_sources/services/swagger.md.txt b/docs/_sources/services/swagger.md.txt
@@ -0,0 +1 @@
+# Swagger - PR
diff --git a/docs/genindex.html b/docs/genindex.html
@@ -119,12 +119,12 @@ <h2>Table Of Contents</h2>
 
     <p class="caption" role="heading"><span class="caption-text">Contents:</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="introduction.html#introduction">Introduction</a></li>
-<li class="toctree-l1"><a class="reference internal" href="installation/index.html#installation">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a></li>
 <li class="toctree-l1"><a class="reference internal" href="services/index.html#services">Services</a></li>
-<li class="toctree-l1"><a class="reference internal" href="utilities/index.html#utilities">Utilities</a></li>
-<li class="toctree-l1"><a class="reference internal" href="workflows/index.html#workflows">Workflows</a></li>
-<li class="toctree-l1"><a class="reference internal" href="roadmap.html#osgs-roadmap">OSGS Roadmap</a></li>
+<li class="toctree-l1"><a class="reference internal" href="utilities/index.html">Utilities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="workflows/index.html">Workflows</a></li>
+<li class="toctree-l1"><a class="reference internal" href="roadmap.html">OSGS Roadmap</a></li>
 </ul>
 
 
@@ -138,12 +138,12 @@ <h2>Table Of Contents</h2>
 
     <p class="caption" role="heading"><span class="caption-text">Contents:</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="introduction.html#introduction">Introduction</a></li>
-<li class="toctree-l1"><a class="reference internal" href="installation/index.html#installation">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a></li>
 <li class="toctree-l1"><a class="reference internal" href="services/index.html#services">Services</a></li>
-<li class="toctree-l1"><a class="reference internal" href="utilities/index.html#utilities">Utilities</a></li>
-<li class="toctree-l1"><a class="reference internal" href="workflows/index.html#workflows">Workflows</a></li>
-<li class="toctree-l1"><a class="reference internal" href="roadmap.html#osgs-roadmap">OSGS Roadmap</a></li>
+<li class="toctree-l1"><a class="reference internal" href="utilities/index.html">Utilities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="workflows/index.html">Workflows</a></li>
+<li class="toctree-l1"><a class="reference internal" href="roadmap.html">OSGS Roadmap</a></li>
 </ul>
 
 

diff --git a/docs/objects.inv b/docs/objects.inv
diff --git a/docs/search.html b/docs/search.html
@@ -121,12 +121,12 @@ <h2>Table Of Contents</h2>
 
     <p class="caption" role="heading"><span class="caption-text">Contents:</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="introduction.html#introduction">Introduction</a></li>
-<li class="toctree-l1"><a class="reference internal" href="installation/index.html#installation">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a></li>
 <li class="toctree-l1"><a class="reference internal" href="services/index.html#services">Services</a></li>
-<li class="toctree-l1"><a class="reference internal" href="utilities/index.html#utilities">Utilities</a></li>
-<li class="toctree-l1"><a class="reference internal" href="workflows/index.html#workflows">Workflows</a></li>
-<li class="toctree-l1"><a class="reference internal" href="roadmap.html#osgs-roadmap">OSGS Roadmap</a></li>
+<li class="toctree-l1"><a class="reference internal" href="utilities/index.html">Utilities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="workflows/index.html">Workflows</a></li>
+<li class="toctree-l1"><a class="reference internal" href="roadmap.html">OSGS Roadmap</a></li>
 </ul>
 
 
@@ -140,12 +140,12 @@ <h2>Table Of Contents</h2>
 
     <p class="caption" role="heading"><span class="caption-text">Contents:</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="introduction.html#introduction">Introduction</a></li>
-<li class="toctree-l1"><a class="reference internal" href="installation/index.html#installation">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a></li>
 <li class="toctree-l1"><a class="reference internal" href="services/index.html#services">Services</a></li>
-<li class="toctree-l1"><a class="reference internal" href="utilities/index.html#utilities">Utilities</a></li>
-<li class="toctree-l1"><a class="reference internal" href="workflows/index.html#workflows">Workflows</a></li>
-<li class="toctree-l1"><a class="reference internal" href="roadmap.html#osgs-roadmap">OSGS Roadmap</a></li>
+<li class="toctree-l1"><a class="reference internal" href="utilities/index.html">Utilities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="workflows/index.html">Workflows</a></li>
+<li class="toctree-l1"><a class="reference internal" href="roadmap.html">OSGS Roadmap</a></li>
 </ul>
 
 

diff --git a/docs/searchindex.js b/docs/searchindex.js