diff --git a/build-local.sh b/build-local.sh index 2c99946..2e9fdbe 100755 --- a/build-local.sh +++ b/build-local.sh @@ -1,5 +1,6 @@ docker stop swarmlab-antora docker container rm swarmlab-antora +sudo ./set-ca4docker.sh docker pull hub.swarmlab.io:5480/antora #docker run -ti --name swarmlab-antora -v $PWD/docs:/antora -v $PWD:/doc-repo hub.swarmlab.io:5480/antora /bin/sh -c "build-local.sh" docker run -ti --name swarmlab-antora -v $PWD/docs:/antora -v $PWD:/doc-repo hub.swarmlab.io:5480/antora /bin/sh -c "DOCSEARCH_ENABLED=true DOCSEARCH_ENGINE=lunr DOCSEARCH_INDEX_VERSION=latest NODE_PATH=/usr/local/lib/node_modules:\$NODE_PATH exec sh -c 'build-local.sh'" diff --git a/build.sh b/build.sh index 634a79d..b0f09a0 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,6 @@ docker stop swarmlab-antora docker container rm swarmlab-antora +sudo ./set-ca4docker.sh docker pull hub.swarmlab.io:5480/antora #docker run -ti --name swarmlab-antora -v $PWD/docs:/antora hub.swarmlab.io:5480/antora /bin/sh -c "build.sh" docker run -ti --name swarmlab-antora -v $PWD/docs:/antora hub.swarmlab.io:5480/antora /bin/sh -c "DOCSEARCH_ENABLED=true DOCSEARCH_ENGINE=lunr DOCSEARCH_INDEX_VERSION=latest NODE_PATH=/usr/local/lib/node_modules:\$NODE_PATH exec sh -c 'build.sh'" diff --git a/docs/modules/myservices/ansible/neovim.yml b/docs/modules/myservices/ansible/neovim.yml index af5685c..d939d62 100644 --- a/docs/modules/myservices/ansible/neovim.yml +++ b/docs/modules/myservices/ansible/neovim.yml @@ -12,12 +12,29 @@ vimrc: "/home/{{ vimuser }}/.vimrc" neovim: "/home/{{ vimuser }}/.config/nvim" neovimplugin: "/home/{{ vimuser }}/.config/nvim/plugin" + neovimplugin: "/home/{{ vimuser }}/.config/nvim/plugin" neoautoload: "/home/{{ vimuser }}/.local/share/nvim/site/autoload" neoopt: "/home/{{ vimuser }}/.local/share/nvim/site/pack/packer/opt/" neostart: "/home/{{ vimuser }}/.local/share/nvim/site/pack/packer/start/" neosite: "/home/{{ vimuser }}/.local/share/nvim/site" tasks: + - name: Ensure .vim/{autoload,bundle} directory exists + file: + path: "{{ item }}" + state: directory + recurse: no + mode: 0750 + loop: + - "{{ vim_dir }}" + - "{{ vim_dir }}/autoload" + - "{{ vim_dir }}/bundle" + - "{{ neovim }}" + - "{{ neovimplugin }}" + - "{{ neoautoload }}" + - "{{ neoopt }}" + - "{{ neostart }}" + - "{{ neosite }}" - name: upgrade become: true diff --git a/set-ca4docker.sh b/set-ca4docker.sh new file mode 100755 index 0000000..561aa8b --- /dev/null +++ b/set-ca4docker.sh @@ -0,0 +1,8 @@ +registry_address=hub.swarmlab.io +registry_port=5443 +mkdir -p /etc/docker/certs.d/$registry_address:$registry_port +openssl s_client -showcerts -connect $registry_address:$registry_port < /dev/null | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' > /etc/docker/certs.d/$registry_address:$registry_port/ca.crt + +registry_port=5480 +mkdir -p /etc/docker/certs.d/$registry_address:$registry_port +openssl s_client -showcerts -connect $registry_address:$registry_port < /dev/null | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' > /etc/docker/certs.d/$registry_address:$registry_port/ca.crt