From 9d8da7dfba4045d4b04611515be4af92c1c48308 Mon Sep 17 00:00:00 2001
From: Simon Marsh <simon@sesa.me.uk>
Date: Sun, 16 Jun 2019 14:12:55 +0100
Subject: [PATCH] re-order for new GoCD deployment

---
 deploy-stage2.sh                              |  18 -------------
 deploy.sh                                     |  24 ------------------
 .../01.home/bgp-communities/default.md        |   0
 {user/pages => pages}/01.home/blog.md         |   0
 .../01.home/burble-dn42-services/default.md   |   0
 .../certs/ca-burble-dn42.pem                  |   0
 .../certs/dn42-fr-rbx1.pem                    |   0
 .../certs/dn42-tr-ist1.pem                    |   0
 .../01.home/certificate-authority/default.md  |   0
 {user/pages => pages}/01.home/dns/default.md  |   0
 .../DN42 Monitoring 190524.png                | Bin
 .../01.home/grafana-service/default.md        |   0
 {user/pages => pages}/01.home/ipam/default.md |   0
 .../01.home/maintenance-log/default.md        |   0
 .../markarian-bandwidth-190510.png            | Bin
 .../01.home/routing-policy/default.md         |   0
 {user/pages => pages}/02.peering/default.md   |   0
 .../03.monitoring/01.network-reach/default.md |   0
 .../03.monitoring/Chart.bundle.min.js         |   0
 .../pages => pages}/03.monitoring/default.md  |   0
 .../pages => pages}/03.monitoring/vis.min.css |   0
 .../pages => pages}/03.monitoring/vis.min.js  |   0
 .../04.about/DN42 Map 190311.png              | Bin
 .../04.about/DN42 Map 190419.png              | Bin
 {user/pages => pages}/04.about/default.md     |   0
 25 files changed, 42 deletions(-)
 delete mode 100755 deploy-stage2.sh
 delete mode 100755 deploy.sh
 rename {user/pages => pages}/01.home/bgp-communities/default.md (100%)
 rename {user/pages => pages}/01.home/blog.md (100%)
 rename {user/pages => pages}/01.home/burble-dn42-services/default.md (100%)
 rename {user/pages => pages}/01.home/certificate-authority/certs/ca-burble-dn42.pem (100%)
 rename {user/pages => pages}/01.home/certificate-authority/certs/dn42-fr-rbx1.pem (100%)
 rename {user/pages => pages}/01.home/certificate-authority/certs/dn42-tr-ist1.pem (100%)
 rename {user/pages => pages}/01.home/certificate-authority/default.md (100%)
 rename {user/pages => pages}/01.home/dns/default.md (100%)
 rename {user/pages => pages}/01.home/grafana-service/DN42 Monitoring 190524.png (100%)
 rename {user/pages => pages}/01.home/grafana-service/default.md (100%)
 rename {user/pages => pages}/01.home/ipam/default.md (100%)
 rename {user/pages => pages}/01.home/maintenance-log/default.md (100%)
 rename {user/pages => pages}/01.home/maintenance-log/markarian-bandwidth-190510.png (100%)
 rename {user/pages => pages}/01.home/routing-policy/default.md (100%)
 rename {user/pages => pages}/02.peering/default.md (100%)
 rename {user/pages => pages}/03.monitoring/01.network-reach/default.md (100%)
 rename {user/pages => pages}/03.monitoring/Chart.bundle.min.js (100%)
 rename {user/pages => pages}/03.monitoring/default.md (100%)
 rename {user/pages => pages}/03.monitoring/vis.min.css (100%)
 rename {user/pages => pages}/03.monitoring/vis.min.js (100%)
 rename {user/pages => pages}/04.about/DN42 Map 190311.png (100%)
 rename {user/pages => pages}/04.about/DN42 Map 190419.png (100%)
 rename {user/pages => pages}/04.about/default.md (100%)

diff --git a/deploy-stage2.sh b/deploy-stage2.sh
deleted file mode 100755
index aeb4d53..0000000
--- a/deploy-stage2.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-########################################################################
-#
-# Website deployment script (stage 2)
-#
-########################################################################
-
-newgrp www-data <<EOF
-# copy the files over
-rsync -rv --chmod=ug=rwX --delete-excluded \
-      /home/deploy/www/user/pages/ \
-      /home/www/user/pages/
-# ensure the www-data group gets inherited
-find /home/www/user/pages -type d -exec chmod g+s {} \; -print
-EOF
-
-########################################################################
-# end of file
diff --git a/deploy.sh b/deploy.sh
deleted file mode 100755
index 1247cec..0000000
--- a/deploy.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash 
-########################################################################
-#
-# Website deployment script
-#
-########################################################################
-
-REPO='git@git.fr-rbx1.burble.dn42:burble.dn42/www.git'
-cd /home/deploy/www
-
-# pull updates to the repo
-git pull
-
-if [ $? -ne 0 ]
-then
-    echo "Something went wrong when pulling the repo"
-    exit 1
-fi
-
-# and execute the (potentially new) second stage deployment script
-./deploy-stage2.sh
-
-########################################################################
-# end of file
diff --git a/user/pages/01.home/bgp-communities/default.md b/pages/01.home/bgp-communities/default.md
similarity index 100%
rename from user/pages/01.home/bgp-communities/default.md
rename to pages/01.home/bgp-communities/default.md
diff --git a/user/pages/01.home/blog.md b/pages/01.home/blog.md
similarity index 100%
rename from user/pages/01.home/blog.md
rename to pages/01.home/blog.md
diff --git a/user/pages/01.home/burble-dn42-services/default.md b/pages/01.home/burble-dn42-services/default.md
similarity index 100%
rename from user/pages/01.home/burble-dn42-services/default.md
rename to pages/01.home/burble-dn42-services/default.md
diff --git a/user/pages/01.home/certificate-authority/certs/ca-burble-dn42.pem b/pages/01.home/certificate-authority/certs/ca-burble-dn42.pem
similarity index 100%
rename from user/pages/01.home/certificate-authority/certs/ca-burble-dn42.pem
rename to pages/01.home/certificate-authority/certs/ca-burble-dn42.pem
diff --git a/user/pages/01.home/certificate-authority/certs/dn42-fr-rbx1.pem b/pages/01.home/certificate-authority/certs/dn42-fr-rbx1.pem
similarity index 100%
rename from user/pages/01.home/certificate-authority/certs/dn42-fr-rbx1.pem
rename to pages/01.home/certificate-authority/certs/dn42-fr-rbx1.pem
diff --git a/user/pages/01.home/certificate-authority/certs/dn42-tr-ist1.pem b/pages/01.home/certificate-authority/certs/dn42-tr-ist1.pem
similarity index 100%
rename from user/pages/01.home/certificate-authority/certs/dn42-tr-ist1.pem
rename to pages/01.home/certificate-authority/certs/dn42-tr-ist1.pem
diff --git a/user/pages/01.home/certificate-authority/default.md b/pages/01.home/certificate-authority/default.md
similarity index 100%
rename from user/pages/01.home/certificate-authority/default.md
rename to pages/01.home/certificate-authority/default.md
diff --git a/user/pages/01.home/dns/default.md b/pages/01.home/dns/default.md
similarity index 100%
rename from user/pages/01.home/dns/default.md
rename to pages/01.home/dns/default.md
diff --git a/user/pages/01.home/grafana-service/DN42 Monitoring 190524.png b/pages/01.home/grafana-service/DN42 Monitoring 190524.png
similarity index 100%
rename from user/pages/01.home/grafana-service/DN42 Monitoring 190524.png
rename to pages/01.home/grafana-service/DN42 Monitoring 190524.png
diff --git a/user/pages/01.home/grafana-service/default.md b/pages/01.home/grafana-service/default.md
similarity index 100%
rename from user/pages/01.home/grafana-service/default.md
rename to pages/01.home/grafana-service/default.md
diff --git a/user/pages/01.home/ipam/default.md b/pages/01.home/ipam/default.md
similarity index 100%
rename from user/pages/01.home/ipam/default.md
rename to pages/01.home/ipam/default.md
diff --git a/user/pages/01.home/maintenance-log/default.md b/pages/01.home/maintenance-log/default.md
similarity index 100%
rename from user/pages/01.home/maintenance-log/default.md
rename to pages/01.home/maintenance-log/default.md
diff --git a/user/pages/01.home/maintenance-log/markarian-bandwidth-190510.png b/pages/01.home/maintenance-log/markarian-bandwidth-190510.png
similarity index 100%
rename from user/pages/01.home/maintenance-log/markarian-bandwidth-190510.png
rename to pages/01.home/maintenance-log/markarian-bandwidth-190510.png
diff --git a/user/pages/01.home/routing-policy/default.md b/pages/01.home/routing-policy/default.md
similarity index 100%
rename from user/pages/01.home/routing-policy/default.md
rename to pages/01.home/routing-policy/default.md
diff --git a/user/pages/02.peering/default.md b/pages/02.peering/default.md
similarity index 100%
rename from user/pages/02.peering/default.md
rename to pages/02.peering/default.md
diff --git a/user/pages/03.monitoring/01.network-reach/default.md b/pages/03.monitoring/01.network-reach/default.md
similarity index 100%
rename from user/pages/03.monitoring/01.network-reach/default.md
rename to pages/03.monitoring/01.network-reach/default.md
diff --git a/user/pages/03.monitoring/Chart.bundle.min.js b/pages/03.monitoring/Chart.bundle.min.js
similarity index 100%
rename from user/pages/03.monitoring/Chart.bundle.min.js
rename to pages/03.monitoring/Chart.bundle.min.js
diff --git a/user/pages/03.monitoring/default.md b/pages/03.monitoring/default.md
similarity index 100%
rename from user/pages/03.monitoring/default.md
rename to pages/03.monitoring/default.md
diff --git a/user/pages/03.monitoring/vis.min.css b/pages/03.monitoring/vis.min.css
similarity index 100%
rename from user/pages/03.monitoring/vis.min.css
rename to pages/03.monitoring/vis.min.css
diff --git a/user/pages/03.monitoring/vis.min.js b/pages/03.monitoring/vis.min.js
similarity index 100%
rename from user/pages/03.monitoring/vis.min.js
rename to pages/03.monitoring/vis.min.js
diff --git a/user/pages/04.about/DN42 Map 190311.png b/pages/04.about/DN42 Map 190311.png
similarity index 100%
rename from user/pages/04.about/DN42 Map 190311.png
rename to pages/04.about/DN42 Map 190311.png
diff --git a/user/pages/04.about/DN42 Map 190419.png b/pages/04.about/DN42 Map 190419.png
similarity index 100%
rename from user/pages/04.about/DN42 Map 190419.png
rename to pages/04.about/DN42 Map 190419.png
diff --git a/user/pages/04.about/default.md b/pages/04.about/default.md
similarity index 100%
rename from user/pages/04.about/default.md
rename to pages/04.about/default.md