From c5d4613dd73f68e73abaa6f59186ad46aabb1ae0 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 16:27:53 +0100 Subject: [PATCH 01/34] Altering workflow in GitHub Actions for building wiki2pages files. --- .../workflows/ce-provision-publish-docs.yml | 67 ++++++------------- ce-dev/ce-dev.compose.yml | 1 - 2 files changed, 21 insertions(+), 47 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 2ba8cbc66..b8709a883 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -1,60 +1,35 @@ -name: Build docs - -# Run this workflow when a PR to 1.x gets merged +# Run this workflow on demand and every time a new commit pushed to your repository on: pull_request: - types: [closed] - branches: - - 1.x + workflow_dispatch: jobs: # Set the job key. The key is displayed as the job name # when a job name is not provided - build-docs: + public-docs: + if: ${{ github.event.pull_request.head.ref != 'documentation' }} # Name the Job - name: Build the documentation + name: Publish the ce-provision docs to GitHub # Set the type of machine to run on - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest - steps: - # Checks out a copy of your repository on the ubuntu-latest machine - - name: Checkout code - uses: actions/checkout@v2 - with: - fetch-depth: 0 + # Use our ce-dev Debian base container + container: + image: codeenigma/ce-dev-controller:2.x + volumes: + - ${{ github.workspace }}:/home/controller - # Configures global Git variables for committing - - name: Configure Git - run: | - git config --global user.email "sysadm@codeenigma.com" - git config --global user.name "Code Enigma CI" - git config --global pull.rebase false - - # Installs the ce-dev stack - - name: Install ce-dev + steps: + - name: Install wiki2pages run: | - cd /tmp - wget https://golang.org/dl/go1.15.8.linux-amd64.tar.gz - sudo tar -C /usr/local -xzf go1.15.8.linux-amd64.tar.gz - export PATH=$PATH:/usr/local/go/bin - git clone https://github.com/FiloSottile/mkcert && cd mkcert - go build -ldflags "-X main.Version=$(git describe --tags)" - sudo mv ./mkcert /usr/local/bin && cd ../ - sudo chmod +x /usr/local/bin/mkcert - rm -Rf mkcert - curl -sL https://raw.githubusercontent.com/codeenigma/ce-dev/1.x/install.sh | /bin/sh -s -- linux + /usr/bin/git clone https://github.com/codeenigma/wikis2pages.git - # Uses the ce-dev stack to run Hugo to format and deploy the docs - - name: Publish documentation + - name: Run wiki2pages against ce-provision 2.x run: | - cd - git clone https://github.com/codeenigma/wikis2pages.git cd wikis2pages - /bin/bash init.sh https://${{ secrets.GITHUB_TOKEN }}@github.com/codeenigma/ce-provision.git 1.x - /bin/sh set-current.sh ce-provision-1.x - docker exec --user ce-dev --workdir /home/ce-dev/deploy/live.local wikis2pages-hugo hugo - /bin/sh .github-actions-push.sh - cd /home/runner/wikis2pages/public/ce-provision-1.x - git remote add ci https://${{ secrets.DOCS_GITHUB_TOKEN }}@github.com/codeenigma/ce-provision-docs.git - git push ci master - shell: bash + /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev + /home/ce-dev/ansible/bin/ansible-playbook ce-dev/ansible/provision.yml + /bin/sh set-current.sh ce-provision-2.x --no-ce-dev + /home/ce-dev/ansible/bin/ansible-playbook ce-dev/ansible/deploy.yml + ls -la public/ + ls -la public/ce-provision-2.x/ diff --git a/ce-dev/ce-dev.compose.yml b/ce-dev/ce-dev.compose.yml index f512e6176..c4a4e2188 100644 --- a/ce-dev/ce-dev.compose.yml +++ b/ce-dev/ce-dev.compose.yml @@ -1,4 +1,3 @@ -version: "3.7" x-ce_dev: version: 1.x registry: localhost:5000 From 84761013444e61909cfe7ef9f01f4c2cf16fc07b Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 16:55:07 +0100 Subject: [PATCH 02/34] Attempting to set a hosts file for Ansible in CI. --- .github/workflows/ce-provision-publish-docs.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index b8709a883..260d7d1d2 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -21,10 +21,14 @@ jobs: steps: - name: Install wiki2pages + run: /usr/bin/git clone https://github.com/codeenigma/wikis2pages.git + + - name: Set up Ansible hosts file run: | - /usr/bin/git clone https://github.com/codeenigma/wikis2pages.git + mkdir -p /home/ce-dev/ansible/bin/hosts + echo "wikis2pages-hugo ansible_host=127.0.0.1" > /home/ce-dev/ansible/bin/hosts/hosts - - name: Run wiki2pages against ce-provision 2.x + - name: Initialise wiki2pages for ce-provision 2.x run: | cd wikis2pages /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev From 327db083cc817177f3d2de18429d3173a2a4b807 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 17:00:11 +0100 Subject: [PATCH 03/34] Trying to force Ansible host. --- .github/workflows/ce-provision-publish-docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 260d7d1d2..757d40a42 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -32,8 +32,8 @@ jobs: run: | cd wikis2pages /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev - /home/ce-dev/ansible/bin/ansible-playbook ce-dev/ansible/provision.yml + /home/ce-dev/ansible/bin/ansible-playbook -i localhost ce-dev/ansible/provision.yml /bin/sh set-current.sh ce-provision-2.x --no-ce-dev - /home/ce-dev/ansible/bin/ansible-playbook ce-dev/ansible/deploy.yml + /home/ce-dev/ansible/bin/ansible-playbook -i localhost ce-dev/ansible/deploy.yml ls -la public/ ls -la public/ce-provision-2.x/ From b5d201a05b28ecdbaa44dfa1f8e3ea4ec30bdb47 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 17:02:30 +0100 Subject: [PATCH 04/34] Trying to force Ansible host. --- .github/workflows/ce-provision-publish-docs.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 757d40a42..0551e3d4f 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -28,12 +28,15 @@ jobs: mkdir -p /home/ce-dev/ansible/bin/hosts echo "wikis2pages-hugo ansible_host=127.0.0.1" > /home/ce-dev/ansible/bin/hosts/hosts + - name: Start SSHD + run: /usr/sbin/sshd& + - name: Initialise wiki2pages for ce-provision 2.x run: | cd wikis2pages /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev - /home/ce-dev/ansible/bin/ansible-playbook -i localhost ce-dev/ansible/provision.yml + /home/ce-dev/ansible/bin/ansible-playbook -i "wikis2pages-hugo ansible_ssh_host=127.0.0.1" ce-dev/ansible/provision.yml /bin/sh set-current.sh ce-provision-2.x --no-ce-dev - /home/ce-dev/ansible/bin/ansible-playbook -i localhost ce-dev/ansible/deploy.yml + /home/ce-dev/ansible/bin/ansible-playbook -i "wikis2pages-hugo ansible_ssh_host=127.0.0.1" ce-dev/ansible/deploy.yml ls -la public/ ls -la public/ce-provision-2.x/ From 64530b15bd5a661987b1512e87f76027b1ee6d42 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 17:05:29 +0100 Subject: [PATCH 05/34] Trying with an inventory file instead. --- .github/workflows/ce-provision-publish-docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 0551e3d4f..bfd1cd14b 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -35,8 +35,8 @@ jobs: run: | cd wikis2pages /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev - /home/ce-dev/ansible/bin/ansible-playbook -i "wikis2pages-hugo ansible_ssh_host=127.0.0.1" ce-dev/ansible/provision.yml + /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts ce-dev/ansible/provision.yml /bin/sh set-current.sh ce-provision-2.x --no-ce-dev - /home/ce-dev/ansible/bin/ansible-playbook -i "wikis2pages-hugo ansible_ssh_host=127.0.0.1" ce-dev/ansible/deploy.yml + /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts ce-dev/ansible/deploy.yml ls -la public/ ls -la public/ce-provision-2.x/ From a8ba1c46da2b71390534162e0115d91350fbb11a Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 17:12:11 +0100 Subject: [PATCH 06/34] Running Ansible as the 'ce-dev' user. --- .github/workflows/ce-provision-publish-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index bfd1cd14b..075ba5efc 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -35,7 +35,7 @@ jobs: run: | cd wikis2pages /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev - /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts ce-dev/ansible/provision.yml + /usr/bin/su - ce-dev -c "/home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts ce-dev/ansible/provision.yml" /bin/sh set-current.sh ce-provision-2.x --no-ce-dev /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts ce-dev/ansible/deploy.yml ls -la public/ From 9d8b47cd84594a327db36ffa82ad982a17236b0a Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 17:14:48 +0100 Subject: [PATCH 07/34] Fixing path to playbook. --- .github/workflows/ce-provision-publish-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 075ba5efc..890220c7c 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -35,7 +35,7 @@ jobs: run: | cd wikis2pages /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev - /usr/bin/su - ce-dev -c "/home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts ce-dev/ansible/provision.yml" + /usr/bin/su - ce-dev -c "/home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /__w/ce-provision/ce-provision/wikis2pages/ce-dev/ansible/provision.yml" /bin/sh set-current.sh ce-provision-2.x --no-ce-dev /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts ce-dev/ansible/deploy.yml ls -la public/ From c87bbd0577cd8aa41ec78f5a5f32db7e7c9fc50f Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 17:17:18 +0100 Subject: [PATCH 08/34] Disabling host key checking. --- .github/workflows/ce-provision-publish-docs.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 890220c7c..5bed4743f 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -1,3 +1,5 @@ +name: Publish docs + # Run this workflow on demand and every time a new commit pushed to your repository on: pull_request: @@ -35,7 +37,7 @@ jobs: run: | cd wikis2pages /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev - /usr/bin/su - ce-dev -c "/home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /__w/ce-provision/ce-provision/wikis2pages/ce-dev/ansible/provision.yml" + /usr/bin/su - ce-dev -c "/home/ce-dev/ansible/bin/ansible-playbook -e ANSIBLE_HOST_KEY_CHECKING=False -i /home/ce-dev/ansible/bin/hosts /__w/ce-provision/ce-provision/wikis2pages/ce-dev/ansible/provision.yml" /bin/sh set-current.sh ce-provision-2.x --no-ce-dev /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts ce-dev/ansible/deploy.yml ls -la public/ From 5bd801e18819e99aacd360bb1e795d3db1c9b96a Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 17:23:09 +0100 Subject: [PATCH 09/34] Disabling host checking in SSH. --- .github/workflows/ce-provision-publish-docs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 5bed4743f..59df23cfc 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -29,6 +29,7 @@ jobs: run: | mkdir -p /home/ce-dev/ansible/bin/hosts echo "wikis2pages-hugo ansible_host=127.0.0.1" > /home/ce-dev/ansible/bin/hosts/hosts + echo "StrictHostKeyChecking=no" > /home/ce-dev/.ssh/config - name: Start SSHD run: /usr/sbin/sshd& @@ -37,7 +38,7 @@ jobs: run: | cd wikis2pages /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev - /usr/bin/su - ce-dev -c "/home/ce-dev/ansible/bin/ansible-playbook -e ANSIBLE_HOST_KEY_CHECKING=False -i /home/ce-dev/ansible/bin/hosts /__w/ce-provision/ce-provision/wikis2pages/ce-dev/ansible/provision.yml" + /usr/bin/su - ce-dev -c "/home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /__w/ce-provision/ce-provision/wikis2pages/ce-dev/ansible/provision.yml" /bin/sh set-current.sh ce-provision-2.x --no-ce-dev /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts ce-dev/ansible/deploy.yml ls -la public/ From 7f0821961fac007a1d63ea683d12dbc72cb575d4 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 17:50:43 +0100 Subject: [PATCH 10/34] Trying to use ce-dev user instead of root. --- .github/workflows/ce-provision-publish-docs.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 59df23cfc..3283d916f 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -23,22 +23,23 @@ jobs: steps: - name: Install wiki2pages - run: /usr/bin/git clone https://github.com/codeenigma/wikis2pages.git + run: /usr/bin/su - ce-dev -c "/usr/bin/git clone https://github.com/codeenigma/wikis2pages.git /home/ce-dev/wiki2pages" - name: Set up Ansible hosts file run: | mkdir -p /home/ce-dev/ansible/bin/hosts echo "wikis2pages-hugo ansible_host=127.0.0.1" > /home/ce-dev/ansible/bin/hosts/hosts echo "StrictHostKeyChecking=no" > /home/ce-dev/.ssh/config + chown ce-dev:ce-dev /home/ce-dev/.ssh/config + chmod 700 /home/ce-dev/.ssh/config - name: Start SSHD run: /usr/sbin/sshd& - name: Initialise wiki2pages for ce-provision 2.x run: | - cd wikis2pages - /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev - /usr/bin/su - ce-dev -c "/home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /__w/ce-provision/ce-provision/wikis2pages/ce-dev/ansible/provision.yml" + /usr/bin/su - ce-dev -c "cd wikis2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" + /usr/bin/su - ce-dev -c "cd wikis2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/wikis2pages/ce-dev/ansible/provision.yml" /bin/sh set-current.sh ce-provision-2.x --no-ce-dev /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts ce-dev/ansible/deploy.yml ls -la public/ From f9e29fc04819d4eb98ee549f4f6bbb8b541001b6 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 17:52:41 +0100 Subject: [PATCH 11/34] Fixing path to scripts. --- .github/workflows/ce-provision-publish-docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 3283d916f..1e5faaffe 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -38,8 +38,8 @@ jobs: - name: Initialise wiki2pages for ce-provision 2.x run: | - /usr/bin/su - ce-dev -c "cd wikis2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" - /usr/bin/su - ce-dev -c "cd wikis2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/wikis2pages/ce-dev/ansible/provision.yml" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/wikis2pages/ce-dev/ansible/provision.yml" /bin/sh set-current.sh ce-provision-2.x --no-ce-dev /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts ce-dev/ansible/deploy.yml ls -la public/ From c120476bc476175856215a759e480ca64a2598c6 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 17:56:54 +0100 Subject: [PATCH 12/34] Adding some debug lines to check playbooks. --- .github/workflows/ce-provision-publish-docs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 1e5faaffe..732518f29 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -39,6 +39,9 @@ jobs: - name: Initialise wiki2pages for ce-provision 2.x run: | /usr/bin/su - ce-dev -c "cd /home/ce-dev/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" + ls -l /home/ce-dev/wiki2pages/ + ls -l /home/ce-dev/wiki2pages/ce-dev/ + ls -l /home/ce-dev/wiki2pages/ce-dev/ansible/ /usr/bin/su - ce-dev -c "cd /home/ce-dev/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/wikis2pages/ce-dev/ansible/provision.yml" /bin/sh set-current.sh ce-provision-2.x --no-ce-dev /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts ce-dev/ansible/deploy.yml From caa1b90d9de9a7fdcf35c8e0923148d77e327a37 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 17:57:38 +0100 Subject: [PATCH 13/34] Fixing workspace volume mount point. --- .github/workflows/ce-provision-publish-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 732518f29..54fdfd92e 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -19,7 +19,7 @@ jobs: container: image: codeenigma/ce-dev-controller:2.x volumes: - - ${{ github.workspace }}:/home/controller + - ${{ github.workspace }}:/home/ce-dev steps: - name: Install wiki2pages From 63667015068ddf23f7d46927cdf8a1f35f61f773 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 18:01:20 +0100 Subject: [PATCH 14/34] Trying a whole new /build location. --- .github/workflows/ce-provision-publish-docs.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 54fdfd92e..5477135fd 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -19,11 +19,11 @@ jobs: container: image: codeenigma/ce-dev-controller:2.x volumes: - - ${{ github.workspace }}:/home/ce-dev + - ${{ github.workspace }}:/build steps: - name: Install wiki2pages - run: /usr/bin/su - ce-dev -c "/usr/bin/git clone https://github.com/codeenigma/wikis2pages.git /home/ce-dev/wiki2pages" + run: /usr/bin/su - ce-dev -c "/usr/bin/git clone https://github.com/codeenigma/wikis2pages.git /build/wiki2pages" - name: Set up Ansible hosts file run: | @@ -38,11 +38,11 @@ jobs: - name: Initialise wiki2pages for ce-provision 2.x run: | - /usr/bin/su - ce-dev -c "cd /home/ce-dev/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" - ls -l /home/ce-dev/wiki2pages/ - ls -l /home/ce-dev/wiki2pages/ce-dev/ - ls -l /home/ce-dev/wiki2pages/ce-dev/ansible/ - /usr/bin/su - ce-dev -c "cd /home/ce-dev/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/wikis2pages/ce-dev/ansible/provision.yml" + /usr/bin/su - ce-dev -c "cd /build/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" + ls -l /build/wiki2pages/ + ls -l /build/wiki2pages/ce-dev/ + ls -l /build/wiki2pages/ce-dev/ansible/ + /usr/bin/su - ce-dev -c "cd /build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /build/wikis2pages/ce-dev/ansible/provision.yml" /bin/sh set-current.sh ce-provision-2.x --no-ce-dev /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts ce-dev/ansible/deploy.yml ls -la public/ From 15af1c3366e49cb65df9aef8dd14bf9046998f52 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 18:05:19 +0100 Subject: [PATCH 15/34] Setting permissions on mounted disk. --- .github/workflows/ce-provision-publish-docs.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 5477135fd..032258990 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -19,11 +19,14 @@ jobs: container: image: codeenigma/ce-dev-controller:2.x volumes: - - ${{ github.workspace }}:/build + - ${{ github.workspace }}:/home/ce-dev steps: + - name: Set permissions + run: chown -Rf ce-dev:ce-dev /home/ce-dev + - name: Install wiki2pages - run: /usr/bin/su - ce-dev -c "/usr/bin/git clone https://github.com/codeenigma/wikis2pages.git /build/wiki2pages" + run: /usr/bin/su - ce-dev -c "/usr/bin/git clone https://github.com/codeenigma/wikis2pages.git /home/ce-dev/wiki2pages" - name: Set up Ansible hosts file run: | @@ -38,11 +41,11 @@ jobs: - name: Initialise wiki2pages for ce-provision 2.x run: | - /usr/bin/su - ce-dev -c "cd /build/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" - ls -l /build/wiki2pages/ - ls -l /build/wiki2pages/ce-dev/ - ls -l /build/wiki2pages/ce-dev/ansible/ - /usr/bin/su - ce-dev -c "cd /build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /build/wikis2pages/ce-dev/ansible/provision.yml" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" + ls -l /home/ce-dev/wiki2pages/ + ls -l /home/ce-dev/wiki2pages/ce-dev/ + ls -l /home/ce-dev/wiki2pages/ce-dev/ansible/ + /usr/bin/su - ce-dev -c "cd /home/ce-dev/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/wikis2pages/ce-dev/ansible/provision.yml" /bin/sh set-current.sh ce-provision-2.x --no-ce-dev /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts ce-dev/ansible/deploy.yml ls -la public/ From a5f04ded4dfdc00141eef92ab0d4383379ebaaf8 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 18:07:53 +0100 Subject: [PATCH 16/34] Checking ce-dev dir contents. --- .github/workflows/ce-provision-publish-docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 032258990..40f2854ab 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -32,6 +32,7 @@ jobs: run: | mkdir -p /home/ce-dev/ansible/bin/hosts echo "wikis2pages-hugo ansible_host=127.0.0.1" > /home/ce-dev/ansible/bin/hosts/hosts + ls -la /home/ce-dev/ echo "StrictHostKeyChecking=no" > /home/ce-dev/.ssh/config chown ce-dev:ce-dev /home/ce-dev/.ssh/config chmod 700 /home/ce-dev/.ssh/config From 6bc2055794762386951dba6fdfcea14113a2f1c4 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 18:10:53 +0100 Subject: [PATCH 17/34] Changing mount point to not destroy ce-dev files. --- .github/workflows/ce-provision-publish-docs.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 40f2854ab..ec0e28917 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -19,14 +19,14 @@ jobs: container: image: codeenigma/ce-dev-controller:2.x volumes: - - ${{ github.workspace }}:/home/ce-dev + - ${{ github.workspace }}:/home/ce-dev/wiki2pages steps: - name: Set permissions - run: chown -Rf ce-dev:ce-dev /home/ce-dev + run: chown -Rf ce-dev:ce-dev /home/ce-dev/build - name: Install wiki2pages - run: /usr/bin/su - ce-dev -c "/usr/bin/git clone https://github.com/codeenigma/wikis2pages.git /home/ce-dev/wiki2pages" + run: /usr/bin/su - ce-dev -c "/usr/bin/git clone https://github.com/codeenigma/wikis2pages.git /home/ce-dev/build/wiki2pages" - name: Set up Ansible hosts file run: | @@ -42,11 +42,11 @@ jobs: - name: Initialise wiki2pages for ce-provision 2.x run: | - /usr/bin/su - ce-dev -c "cd /home/ce-dev/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" - ls -l /home/ce-dev/wiki2pages/ - ls -l /home/ce-dev/wiki2pages/ce-dev/ - ls -l /home/ce-dev/wiki2pages/ce-dev/ansible/ - /usr/bin/su - ce-dev -c "cd /home/ce-dev/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/wikis2pages/ce-dev/ansible/provision.yml" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" + ls -l /home/ce-dev/build/wiki2pages/ + ls -l /home/ce-dev/build/wiki2pages/ce-dev/ + ls -l /home/ce-dev/build/wiki2pages/ce-dev/ansible/ + /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wikis2pages/ce-dev/ansible/provision.yml" /bin/sh set-current.sh ce-provision-2.x --no-ce-dev /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts ce-dev/ansible/deploy.yml ls -la public/ From c5626076e3d07d8ad33a9307e5f4f5cbd0213638 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 18:13:14 +0100 Subject: [PATCH 18/34] Commenting permissions line. --- .github/workflows/ce-provision-publish-docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index ec0e28917..0c4e5a8e7 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -22,8 +22,8 @@ jobs: - ${{ github.workspace }}:/home/ce-dev/wiki2pages steps: - - name: Set permissions - run: chown -Rf ce-dev:ce-dev /home/ce-dev/build + #- name: Set permissions + # run: chown -Rf ce-dev:ce-dev /home/ce-dev/build - name: Install wiki2pages run: /usr/bin/su - ce-dev -c "/usr/bin/git clone https://github.com/codeenigma/wikis2pages.git /home/ce-dev/build/wiki2pages" From 9502efe143928c25ae1143b3dbca2705a48d7618 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 18:18:02 +0100 Subject: [PATCH 19/34] Fixing playbook paths. --- .github/workflows/ce-provision-publish-docs.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 0c4e5a8e7..a5b9f03bd 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -22,9 +22,6 @@ jobs: - ${{ github.workspace }}:/home/ce-dev/wiki2pages steps: - #- name: Set permissions - # run: chown -Rf ce-dev:ce-dev /home/ce-dev/build - - name: Install wiki2pages run: /usr/bin/su - ce-dev -c "/usr/bin/git clone https://github.com/codeenigma/wikis2pages.git /home/ce-dev/build/wiki2pages" @@ -43,11 +40,8 @@ jobs: - name: Initialise wiki2pages for ce-provision 2.x run: | /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" - ls -l /home/ce-dev/build/wiki2pages/ - ls -l /home/ce-dev/build/wiki2pages/ce-dev/ - ls -l /home/ce-dev/build/wiki2pages/ce-dev/ansible/ - /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wikis2pages/ce-dev/ansible/provision.yml" - /bin/sh set-current.sh ce-provision-2.x --no-ce-dev - /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts ce-dev/ansible/deploy.yml + /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/provision.yml" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh set-current.sh --project ce-provision-2.x --no-ce-dev" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/deploy.yml" ls -la public/ ls -la public/ce-provision-2.x/ From 88a7b127127f86eae586d792aa5b0fadcfe61697 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 18:23:47 +0100 Subject: [PATCH 20/34] Outputting hosts and SSH config for debug. --- .github/workflows/ce-provision-publish-docs.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index a5b9f03bd..8bf52024f 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -40,6 +40,8 @@ jobs: - name: Initialise wiki2pages for ce-provision 2.x run: | /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" + cat /home/ce-dev/ansible/bin/hosts/hosts + cat /home/ce-dev/.ssh/config /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/provision.yml" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh set-current.sh --project ce-provision-2.x --no-ce-dev" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/deploy.yml" From 084eaa367835401ca2635b9426b98759d6bd4d26 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 18:26:07 +0100 Subject: [PATCH 21/34] Checking SSH settings. --- .github/workflows/ce-provision-publish-docs.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 8bf52024f..320e88616 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -29,7 +29,6 @@ jobs: run: | mkdir -p /home/ce-dev/ansible/bin/hosts echo "wikis2pages-hugo ansible_host=127.0.0.1" > /home/ce-dev/ansible/bin/hosts/hosts - ls -la /home/ce-dev/ echo "StrictHostKeyChecking=no" > /home/ce-dev/.ssh/config chown ce-dev:ce-dev /home/ce-dev/.ssh/config chmod 700 /home/ce-dev/.ssh/config @@ -40,8 +39,8 @@ jobs: - name: Initialise wiki2pages for ce-provision 2.x run: | /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" - cat /home/ce-dev/ansible/bin/hosts/hosts - cat /home/ce-dev/.ssh/config + ls -la /home/ce-dev/.ssh + cat /home/ce-dev/.ssh/authorized_keys /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/provision.yml" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh set-current.sh --project ce-provision-2.x --no-ce-dev" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/deploy.yml" From 53b00d7c8b0f328a67e11eee0ad1551c3d4a5017 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 18:33:36 +0100 Subject: [PATCH 22/34] Manually creating authorized_keys. --- .github/workflows/ce-provision-publish-docs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 320e88616..6c6b2eb40 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -30,8 +30,11 @@ jobs: mkdir -p /home/ce-dev/ansible/bin/hosts echo "wikis2pages-hugo ansible_host=127.0.0.1" > /home/ce-dev/ansible/bin/hosts/hosts echo "StrictHostKeyChecking=no" > /home/ce-dev/.ssh/config + cat /home/ce-dev/.ssh/id_rsa.pub > /home/ce-dev/.ssh/authorized_keys chown ce-dev:ce-dev /home/ce-dev/.ssh/config chmod 700 /home/ce-dev/.ssh/config + chown ce-dev:ce-dev /home/ce-dev/.ssh/authorized_keys + chmod 700 /home/ce-dev/.ssh/authorized_keys - name: Start SSHD run: /usr/sbin/sshd& From 4e029374519811f23cbb1356191282acfa0aa636 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 18:38:26 +0100 Subject: [PATCH 23/34] Fixing path to set-current. --- .github/workflows/ce-provision-publish-docs.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 6c6b2eb40..6215b0436 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -42,10 +42,8 @@ jobs: - name: Initialise wiki2pages for ce-provision 2.x run: | /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" - ls -la /home/ce-dev/.ssh - cat /home/ce-dev/.ssh/authorized_keys /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/provision.yml" - /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh set-current.sh --project ce-provision-2.x --no-ce-dev" + /usr/bin/su - ce-dev -c "/bin/sh /home/ce-dev/deploy/live.local/set-current.sh --project ce-provision-2.x --no-ce-dev" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/deploy.yml" ls -la public/ ls -la public/ce-provision-2.x/ From 36c0aeb338a1b62bb35c9156d5935341ed420729 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 18:41:55 +0100 Subject: [PATCH 24/34] Refactoring SSH set-up and looking at set-current script. --- .github/workflows/ce-provision-publish-docs.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 6215b0436..8830544c8 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -19,7 +19,7 @@ jobs: container: image: codeenigma/ce-dev-controller:2.x volumes: - - ${{ github.workspace }}:/home/ce-dev/wiki2pages + - ${{ github.workspace }}:/home/ce-dev/build steps: - name: Install wiki2pages @@ -29,6 +29,9 @@ jobs: run: | mkdir -p /home/ce-dev/ansible/bin/hosts echo "wikis2pages-hugo ansible_host=127.0.0.1" > /home/ce-dev/ansible/bin/hosts/hosts + + - name: Set up SSH config + run: | echo "StrictHostKeyChecking=no" > /home/ce-dev/.ssh/config cat /home/ce-dev/.ssh/id_rsa.pub > /home/ce-dev/.ssh/authorized_keys chown ce-dev:ce-dev /home/ce-dev/.ssh/config @@ -43,6 +46,7 @@ jobs: run: | /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/provision.yml" + cat /home/ce-dev/deploy/live.local/set-current.sh /usr/bin/su - ce-dev -c "/bin/sh /home/ce-dev/deploy/live.local/set-current.sh --project ce-provision-2.x --no-ce-dev" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/deploy.yml" ls -la public/ From 5c4d4eb80bea1cd96cc6834484e81aa28351dbbe Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 18:44:08 +0100 Subject: [PATCH 25/34] Trying to fix mount point. --- .github/workflows/ce-provision-publish-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 8830544c8..35189a963 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -19,7 +19,7 @@ jobs: container: image: codeenigma/ce-dev-controller:2.x volumes: - - ${{ github.workspace }}:/home/ce-dev/build + - ${{ github.workspace }}:/home/controller steps: - name: Install wiki2pages From a16ec18b8086a3a67e3a50604b8d504d462eaf40 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 18:55:50 +0100 Subject: [PATCH 26/34] Updating paths to generated docs. --- .github/workflows/ce-provision-publish-docs.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 35189a963..aa81e3997 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -49,5 +49,7 @@ jobs: cat /home/ce-dev/deploy/live.local/set-current.sh /usr/bin/su - ce-dev -c "/bin/sh /home/ce-dev/deploy/live.local/set-current.sh --project ce-provision-2.x --no-ce-dev" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/deploy.yml" - ls -la public/ - ls -la public/ce-provision-2.x/ + ls -la /home/ce-dev/deploy/live.local/public/ + ls -la /home/ce-dev/deploy/live.local/public/ce-provision-2.x/ + ls -la /home/ce-dev/deploy/live.local/content/ + ls -la /home/ce-dev/deploy/live.local/content/ce-provision-2.x/ From 5c83f82379bbecb67379c33997a6fb1e7fd02bf8 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 19:12:49 +0100 Subject: [PATCH 27/34] Trying to pass in path to wiki2pages. --- .github/workflows/ce-provision-publish-docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index aa81e3997..3a3b5d54e 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -45,10 +45,10 @@ jobs: - name: Initialise wiki2pages for ce-provision 2.x run: | /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" - /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/provision.yml" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -e 'wiki2pages_build_path=/home/ce-dev/build/wiki2pages' -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/provision.yml" cat /home/ce-dev/deploy/live.local/set-current.sh /usr/bin/su - ce-dev -c "/bin/sh /home/ce-dev/deploy/live.local/set-current.sh --project ce-provision-2.x --no-ce-dev" - /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/deploy.yml" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -e 'wiki2pages_build_path=/home/ce-dev/build/wiki2pages' -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/deploy.yml" ls -la /home/ce-dev/deploy/live.local/public/ ls -la /home/ce-dev/deploy/live.local/public/ce-provision-2.x/ ls -la /home/ce-dev/deploy/live.local/content/ From a077a5fa05527046f6dae9fc3d30e210c1b8ccb0 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 19:14:25 +0100 Subject: [PATCH 28/34] Removing obsolete debug line. --- .github/workflows/ce-provision-publish-docs.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 3a3b5d54e..47dd1031c 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -46,7 +46,6 @@ jobs: run: | /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -e 'wiki2pages_build_path=/home/ce-dev/build/wiki2pages' -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/provision.yml" - cat /home/ce-dev/deploy/live.local/set-current.sh /usr/bin/su - ce-dev -c "/bin/sh /home/ce-dev/deploy/live.local/set-current.sh --project ce-provision-2.x --no-ce-dev" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -e 'wiki2pages_build_path=/home/ce-dev/build/wiki2pages' -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/deploy.yml" ls -la /home/ce-dev/deploy/live.local/public/ From 9ce237e7cb79cc45a00b7a01d5eb3bc3cdaaa12c Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 19:16:17 +0100 Subject: [PATCH 29/34] Correcting path to script. --- .github/workflows/ce-provision-publish-docs.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 47dd1031c..127bafeb5 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -46,9 +46,10 @@ jobs: run: | /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -e 'wiki2pages_build_path=/home/ce-dev/build/wiki2pages' -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/provision.yml" - /usr/bin/su - ce-dev -c "/bin/sh /home/ce-dev/deploy/live.local/set-current.sh --project ce-provision-2.x --no-ce-dev" + /usr/bin/su - ce-dev -c "/bin/sh /home/ce-dev/build/wiki2pages/set-current.sh --project ce-provision-2.x --no-ce-dev" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -e 'wiki2pages_build_path=/home/ce-dev/build/wiki2pages' -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/deploy.yml" - ls -la /home/ce-dev/deploy/live.local/public/ - ls -la /home/ce-dev/deploy/live.local/public/ce-provision-2.x/ - ls -la /home/ce-dev/deploy/live.local/content/ - ls -la /home/ce-dev/deploy/live.local/content/ce-provision-2.x/ + ls -la /home/ce-dev/build/wiki2pages/ + ls -la /home/ce-dev/build/wiki2pages/public/ + ls -la /home/ce-dev/build/wiki2pages/public/ce-provision-2.x/ + ls -la /home/ce-dev/build/wiki2pages/content/ + ls -la /home/ce-dev/build/wiki2pages/content/ce-provision-2.x/ From 06c8b08ec931fff1da3ca6d37c59300a3de13014 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Fri, 3 Jan 2025 19:24:13 +0100 Subject: [PATCH 30/34] Changing path we execute from. --- .github/workflows/ce-provision-publish-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 127bafeb5..e6b7435ed 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -46,7 +46,7 @@ jobs: run: | /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -e 'wiki2pages_build_path=/home/ce-dev/build/wiki2pages' -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/provision.yml" - /usr/bin/su - ce-dev -c "/bin/sh /home/ce-dev/build/wiki2pages/set-current.sh --project ce-provision-2.x --no-ce-dev" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh set-current.sh --project ce-provision-2.x --no-ce-dev" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -e 'wiki2pages_build_path=/home/ce-dev/build/wiki2pages' -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/deploy.yml" ls -la /home/ce-dev/build/wiki2pages/ ls -la /home/ce-dev/build/wiki2pages/public/ From 0f8be8be244675ef3b200cc677336a2b850f5a1c Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Mon, 6 Jan 2025 14:26:35 +0100 Subject: [PATCH 31/34] Adding first pass at docs publish step. --- .github/workflows/ce-provision-publish-docs.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index e6b7435ed..4adb93b91 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -53,3 +53,10 @@ jobs: ls -la /home/ce-dev/build/wiki2pages/public/ce-provision-2.x/ ls -la /home/ce-dev/build/wiki2pages/content/ ls -la /home/ce-dev/build/wiki2pages/content/ce-provision-2.x/ + + - name: Publish documentation + run: | + /usr/bin/su - ce-dev -c "/bin/sh /home/ce-dev/build/wiki2pages/.github-actions-push.sh" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages/content/ce-provision-2.x/" + /usr/bin/su - ce-dev -c "/usr/bin/git remote add ci https://${{ secrets.DOCS_GITHUB_TOKEN }}@github.com/codeenigma/ce-provision-docs.git" + /usr/bin/su - ce-dev -c "/usr/bin/git push ci master" From cdb28c2b3797d50cd46b20c047ea56b627fcf39f Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Mon, 6 Jan 2025 15:19:37 +0100 Subject: [PATCH 32/34] Repairing working dir paths. --- .github/workflows/ce-provision-publish-docs.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 4adb93b91..4d9b1c6c6 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -56,7 +56,6 @@ jobs: - name: Publish documentation run: | - /usr/bin/su - ce-dev -c "/bin/sh /home/ce-dev/build/wiki2pages/.github-actions-push.sh" - /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages/content/ce-provision-2.x/" - /usr/bin/su - ce-dev -c "/usr/bin/git remote add ci https://${{ secrets.DOCS_GITHUB_TOKEN }}@github.com/codeenigma/ce-provision-docs.git" - /usr/bin/su - ce-dev -c "/usr/bin/git push ci master" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh /home/ce-dev/build/wiki2pages/.github-actions-push.sh" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages/content/ce-provision-2.x && /usr/bin/git remote add ci https://${{ secrets.DOCS_GITHUB_TOKEN }}@github.com/codeenigma/ce-provision-docs.git" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages/content/ce-provision-2.x && /usr/bin/git push ci master" From 93751a481c6f88750c99f8e4d5729ec39ffa9a02 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Mon, 6 Jan 2025 15:26:59 +0100 Subject: [PATCH 33/34] Incorrect repo path. --- .github/workflows/ce-provision-publish-docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index 4d9b1c6c6..a11043df0 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -57,5 +57,5 @@ jobs: - name: Publish documentation run: | /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh /home/ce-dev/build/wiki2pages/.github-actions-push.sh" - /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages/content/ce-provision-2.x && /usr/bin/git remote add ci https://${{ secrets.DOCS_GITHUB_TOKEN }}@github.com/codeenigma/ce-provision-docs.git" - /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages/content/ce-provision-2.x && /usr/bin/git push ci master" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages/public/ce-provision-2.x && /usr/bin/git remote add ci https://${{ secrets.DOCS_GITHUB_TOKEN }}@github.com/codeenigma/ce-provision-docs.git" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages/public/ce-provision-2.x && /usr/bin/git push ci master" From d8f39080b27f7c6fcbfd7ceff756f82807655370 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Mon, 6 Jan 2025 16:03:48 +0100 Subject: [PATCH 34/34] Removing most of the debug lines. --- .github/workflows/ce-provision-publish-docs.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index a11043df0..e3ef2ca95 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -48,11 +48,7 @@ jobs: /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -e 'wiki2pages_build_path=/home/ce-dev/build/wiki2pages' -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/provision.yml" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh set-current.sh --project ce-provision-2.x --no-ce-dev" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -e 'wiki2pages_build_path=/home/ce-dev/build/wiki2pages' -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/deploy.yml" - ls -la /home/ce-dev/build/wiki2pages/ - ls -la /home/ce-dev/build/wiki2pages/public/ ls -la /home/ce-dev/build/wiki2pages/public/ce-provision-2.x/ - ls -la /home/ce-dev/build/wiki2pages/content/ - ls -la /home/ce-dev/build/wiki2pages/content/ce-provision-2.x/ - name: Publish documentation run: |