update to latest docker config.

.env

@@ -0,0 +1,51 @@
+# Global
+GLOBAL_TZ="Australia/Melbourne"
+DOMAIN_NAME="localhost"
+DOMAIN_URL="https://${DOMAIN_NAME}"
+PUBLIC_URL="https://governance.foundation"
+ENV_FILE=".env" # used for secrets in containers
+GIT_REPO="https://github.com/governance-foundation/governance.foundation"
+GIT_USER="governance-foundation"
+SITE_TITLE="Governance Foundation"
+SITE_DESCRIPTION="Governance Foundation exploring foundations for governance"
+EMAIL="devops@governance.foundation"
+# Google Drive
+GOOGLE_DRIVE_FOLDER="https://drive.google.com/drive/u/0/folders/1n5tDuoSgp3BWthd43GDue0PPUR6LVOFD"
+
+# Traefik
+TRAEFIK_API_PORT=8080
+TRAEFIK_HTTP_PORT=80
+TRAEFIK_HTTPS_PORT=443
+TRAEFIK_SUBDOMAIN_NAME="traefik"
+TRAEFIK_DOCKER_SOCK="/var/run/docker.sock"
+TRAEFIK_CERTIFICATE_PATH="./services/traefik/certs"
+TRAEFIK_CONFIG_DYNAMIC_PATH="./services/traefik/config/dynamic"
+TRAEFIK_LOG_LEVEL="DEBUG"
+TRAEFIK_ACCESS_LOG="true"
+TRAEFIK_PILOT_TOKEN="1af198ae-0690-45a2-976f-0e414979a440"
+TRAEFIK_HOST="${TRAEFIK_SUBDOMAIN_NAME}.${DOMAIN_NAME}"
+TRAEFIK_URL="https://${TRAEFIK_SUBDOMAIN_NAME}.${DOMAIN_NAME}"
+
+
+# Traefik - createcertpkcs12
+# used for exporting private key
+TRAEFIK_CERT_KEYPASS="McinQrzivavwhzxzqrGnatXRiYcbUKDikGuHTRyxXVXddzkFiqRWGNYGjxxL"
+
+# Nginx
+NGINX_CONTENT_PATH="./services/nginx/content"
+NGINX_CONTENT_BUILD_PATH="./services/nginx/data/build"
+NGINX_CONFIG_FILE="./services/nginx/config/nginx.conf"
+
+# Server
+SERVER_CONTENT_PATH="./"
+SERVER_LIVERELOAD_PORT=35729
+SERVER_PORT=4000
+SERVER_SUBDOMAIN_NAME="gvfn"
+SERVER_HOST="${SERVER_SUBDOMAIN_NAME}.${DOMAIN_NAME}"
+SERVER_URL="https://${SERVER_SUBDOMAIN_NAME}.${DOMAIN_NAME}"
+
+
+
+# Traefik - createcert
+# used for making new certificates
+TRAEFIK_CERT_DOMAINS="${TRAEFIK_HOST} ${SERVER_HOST} localhost 127.0.0.1 ::1"

.gitignore

@@ -7,3 +7,4 @@ Gemfile.lock
 .ssl/
 *.iml
 .DS_Store
+logs/

Gemfile

@@ -13,6 +13,7 @@ gem "jekyll"
 gem "nokogiri"
 gem "ffi"
 gem "i18n"
+gem "webrick"
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 gem "minimal-mistakes-jekyll", ">= 4.22.0"

_config.txt

@@ -0,0 +1,6 @@
+title: ${SITE_TITLE}
+name: ${SITE_TITLE}
+email: ${EMAIL}
+description: > # this means to ignore newlines until next attribute
+  ${SITE_DESCRIPTION}
+github_username:  ${GIT_USER}

_config.yml

@@ -180,6 +180,7 @@ exclude:
   - .asset-cache
   - .bundle
   - .jekyll-assets-cache
+  - .jekyll-metadata
   - .sass-cache
   - assets/js/plugins
   - assets/js/_main.js
@@ -191,13 +192,18 @@ exclude:
   - Gruntfile.js
   - gulpfile.js
   - LICENSE
-  - log
+  - logs
   - node_modules
   - package.json
   - package-lock.json
   - Rakefile
   - README
   - tmp
+  - services
+  - "*.sh"
+  - "docker-*"
+  - .idea
+  - .github
 keep_files:
   - .git
   - .svn

_configenv.yml

@@ -0,0 +1,6 @@
+title: Governance Foundation
+name: Governance Foundation
+email: devops@governance.foundation
+description: > # this means to ignore newlines until next attribute
+  Governance Foundation exploring foundations for governance
+github_username:  governance-foundation

_gxp/diagrams/GXP-Architecture.drawio

@@ -1,6 +1,6 @@
 <mxfile host="65bd71144e" pages="2">
     <diagram id="fKNdlD2plWOkOZGuG4vE" name="Services">
-        <mxGraphModel dx="1867" dy="1805" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
+        <mxGraphModel dx="3488" dy="1681" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
             <root>
                 <mxCell id="0"/>
                 <mxCell id="hdmXZGqUlNRK6feqRWDT-110" value="Experience" parent="0"/>
@@ -110,10 +110,10 @@
                 <mxCell id="11" style="edgeStyle=none;html=1;" parent="hdmXZGqUlNRK6feqRWDT-110" source="7" target="hdmXZGqUlNRK6feqRWDT-38" edge="1">
                     <mxGeometry relative="1" as="geometry"/>
                 </mxCell>
-                <mxCell id="27" style="edgeStyle=none;html=1;dashed=1;" edge="1" parent="hdmXZGqUlNRK6feqRWDT-110" source="21" target="hdmXZGqUlNRK6feqRWDT-38">
+                <mxCell id="27" style="edgeStyle=none;html=1;dashed=1;" parent="hdmXZGqUlNRK6feqRWDT-110" source="21" target="hdmXZGqUlNRK6feqRWDT-38" edge="1">
                     <mxGeometry relative="1" as="geometry"/>
                 </mxCell>
-                <mxCell id="21" value="Social Graph" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="hdmXZGqUlNRK6feqRWDT-110">
+                <mxCell id="21" value="Social Graph" style="rounded=0;whiteSpace=wrap;html=1;" parent="hdmXZGqUlNRK6feqRWDT-110" vertex="1">
                     <mxGeometry x="460" y="-170" width="130" height="60" as="geometry"/>
                 </mxCell>
                 <mxCell id="hdmXZGqUlNRK6feqRWDT-15" value="Architecture" parent="0"/>

docker-build.sh

@@ -11,4 +11,4 @@ gem install jekyll bundler i18n jemoji nokogiri -n /usr/local/bin
 
 bundle install
 bundle exec jekyll build --trace
-bundle exec htmlproofer --trace --check-html --internal-domains localhost:8100 --assume-extension --disable-external --url-ignore "/#.*/" _site
+# bundle exec htmlproofer --trace --check-html --internal-domains localhost:8100 --assume-extension --disable-external --url-ignore "/#.*/" _site

docker-compose.yml

@@ -1,62 +1,4 @@
-version: "2.4"
-
-services:
-
-  nginx:
-    extends:
-      file: ./docker/nginx/docker-compose.yml
-      service: nginx
-    volumes:
-      - ./docker/nginx/content:/content
-      - ./docker/nginx/config/nginx.conf:/etc/nginx/nginx.conf
-
-  createcert:
-    extends:
-      file: ./docker/traefik/docker-compose.yml
-      service: createcert
-    volumes:
-      - ./docker/traefik/certs:/root/.local/share/mkcert
-
-  createcertpkcs12:
-    extends:
-      file: ./docker/traefik/docker-compose.yml
-      service: createcertpkcs12
-    depends_on:
-      - createcert
-    volumes:
-      - ./docker/traefik/certs:/export
-
-  traefik:
-    extends:
-      file: ./docker/traefik/docker-compose.yml
-      service: traefik
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-      # Persist certificates, so we can restart as often as needed
-      - ./docker/traefik/certs:/letsencrypt
-      - ./docker/traefik/config/config.yml:/etc/traefik/dynamic_conf/conf.yml:ro
-    depends_on:
-      - createcert
-      - createcertpkcs12
-
-  server:
-    extends:
-      file: ./docker/server/docker-compose.yml
-      service: server
-    depends_on:
-      - traefik
-
-  webp-create:
-    extends:
-      file: ./docker/server/docker-compose.yml
-      service: webp-create
-
-  webp-update:
-    extends:
-      file: ./docker/server/docker-compose.yml
-      service: webp-update
-    depends_on:
-      - traefik
+version: "3.8"
 
 networks:
   internal: