From f1fb7607b56a802d6a052322246eed1ef7e70ae4 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Wed, 5 Jun 2019 13:19:22 +0200 Subject: [PATCH] Finalize restructuralization --- {_build => build}/build-all.sh | 6 +++--- {_build => build}/etc/abuild.conf | 0 {_build => build}/etc/nginx/conf.d/apkrepo.conf | 0 {_build => build}/install-toolchain.sh | 0 {_build => build}/root/.config/htop/htoprc | 0 {_build => build}/root/.profile | 0 {_build => build}/usr/bin/fix-apk | 0 {_build => build}/usr/bin/lxc-build | 0 {_build => build}/usr/bin/lxc-pack | 0 {_doc => doc}/Makefile | 0 {_doc => doc}/conf.py | 0 {_doc => doc}/existing/index.rst | 0 {_doc => doc}/existing/list.md | 0 {_doc => doc}/existing/map-services.md | 0 {_doc => doc}/existing/tech-overview.md | 0 {_doc => doc}/index.rst | 0 {_doc => doc}/toolchain/abuild.md | 0 {_doc => doc}/toolchain/index.rst | 0 {_doc => doc}/toolchain/lxc-build.md | 0 {_doc => doc}/toolchain/lxc-overview.md | 0 {_doc => doc}/toolchain/lxc-pack.md | 0 {_doc => doc}/toolchain/pkgmgr.md | 0 {_doc => doc}/toolchain/vm-creation.md | 6 +++--- {_doc => doc}/toolchain/vmmgr-hooks.md | 0 {_extra => extra}/frontlinesms-lang-js.py | 0 {_extra => extra}/myip.php | 0 {_extra => extra}/sahana-lang-csv.py | 0 {_extra => extra}/vm-ping.php | 0 _vm.sh => vm.sh | 2 +- {_vm => vm}/boot/extlinux.conf | 0 {_vm => vm}/boot/vm.txt | 0 {_vm => vm}/etc/apk/keys/repokey.rsa.pub | 0 {_vm => vm}/etc/apk/repositories | 0 {_vm => vm}/etc/conf.d/consolefont | 0 {_vm => vm}/etc/conf.d/iptables | 0 {_vm => vm}/etc/hostname | 0 {_vm => vm}/etc/hosts | 0 {_vm => vm}/etc/inittab | 0 {_vm => vm}/etc/iptables/rules-save | 0 {_vm => vm}/etc/network/interfaces | 0 {_vm => vm}/etc/nginx/conf.d/default.conf | 0 {_vm => vm}/etc/nginx/nginx.conf | 0 {_vm => vm}/etc/postfix/main.cf | 0 {_vm => vm}/etc/rc.conf | 0 {_vm => vm}/etc/ssl/services.key | 0 {_vm => vm}/etc/ssl/services.pem | 0 {_vm => vm}/etc/wireguard/wg0.conf.disabled | 0 {_vm => vm}/sbin/extend-disk | 0 {_vm => vm}/sbin/vmtty | 0 49 files changed, 7 insertions(+), 7 deletions(-) rename {_build => build}/build-all.sh (98%) rename {_build => build}/etc/abuild.conf (100%) rename {_build => build}/etc/nginx/conf.d/apkrepo.conf (100%) rename {_build => build}/install-toolchain.sh (100%) rename {_build => build}/root/.config/htop/htoprc (100%) rename {_build => build}/root/.profile (100%) rename {_build => build}/usr/bin/fix-apk (100%) rename {_build => build}/usr/bin/lxc-build (100%) rename {_build => build}/usr/bin/lxc-pack (100%) rename {_doc => doc}/Makefile (100%) rename {_doc => doc}/conf.py (100%) rename {_doc => doc}/existing/index.rst (100%) rename {_doc => doc}/existing/list.md (100%) rename {_doc => doc}/existing/map-services.md (100%) rename {_doc => doc}/existing/tech-overview.md (100%) rename {_doc => doc}/index.rst (100%) rename {_doc => doc}/toolchain/abuild.md (100%) rename {_doc => doc}/toolchain/index.rst (100%) rename {_doc => doc}/toolchain/lxc-build.md (100%) rename {_doc => doc}/toolchain/lxc-overview.md (100%) rename {_doc => doc}/toolchain/lxc-pack.md (100%) rename {_doc => doc}/toolchain/pkgmgr.md (100%) rename {_doc => doc}/toolchain/vm-creation.md (96%) rename {_doc => doc}/toolchain/vmmgr-hooks.md (100%) rename {_extra => extra}/frontlinesms-lang-js.py (100%) rename {_extra => extra}/myip.php (100%) rename {_extra => extra}/sahana-lang-csv.py (100%) rename {_extra => extra}/vm-ping.php (100%) rename _vm.sh => vm.sh (97%) rename {_vm => vm}/boot/extlinux.conf (100%) rename {_vm => vm}/boot/vm.txt (100%) rename {_vm => vm}/etc/apk/keys/repokey.rsa.pub (100%) rename {_vm => vm}/etc/apk/repositories (100%) rename {_vm => vm}/etc/conf.d/consolefont (100%) rename {_vm => vm}/etc/conf.d/iptables (100%) rename {_vm => vm}/etc/hostname (100%) rename {_vm => vm}/etc/hosts (100%) rename {_vm => vm}/etc/inittab (100%) rename {_vm => vm}/etc/iptables/rules-save (100%) rename {_vm => vm}/etc/network/interfaces (100%) rename {_vm => vm}/etc/nginx/conf.d/default.conf (100%) rename {_vm => vm}/etc/nginx/nginx.conf (100%) rename {_vm => vm}/etc/postfix/main.cf (100%) rename {_vm => vm}/etc/rc.conf (100%) rename {_vm => vm}/etc/ssl/services.key (100%) rename {_vm => vm}/etc/ssl/services.pem (100%) rename {_vm => vm}/etc/wireguard/wg0.conf.disabled (100%) rename {_vm => vm}/sbin/extend-disk (100%) rename {_vm => vm}/sbin/vmtty (100%) diff --git a/_build/build-all.sh b/build/build-all.sh similarity index 98% rename from _build/build-all.sh rename to build/build-all.sh index 72aa6b2..9662bb6 100755 --- a/_build/build-all.sh +++ b/build/build-all.sh @@ -4,12 +4,12 @@ set -ev ROOT=$(dirname $(dirname $(realpath "${0}"))) # Build documentation -cd ${ROOT}/_doc +cd ${ROOT}/doc make html # Build basic.tar -cd ${ROOT}/_vm -tar cpf /srv/build/_vm.tar * +cd ${ROOT}/vm +tar cpf /srv/build/vm.tar * # Build native apps cd ${ROOT}/apk/acme-sh diff --git a/_build/etc/abuild.conf b/build/etc/abuild.conf similarity index 100% rename from _build/etc/abuild.conf rename to build/etc/abuild.conf diff --git a/_build/etc/nginx/conf.d/apkrepo.conf b/build/etc/nginx/conf.d/apkrepo.conf similarity index 100% rename from _build/etc/nginx/conf.d/apkrepo.conf rename to build/etc/nginx/conf.d/apkrepo.conf diff --git a/_build/install-toolchain.sh b/build/install-toolchain.sh similarity index 100% rename from _build/install-toolchain.sh rename to build/install-toolchain.sh diff --git a/_build/root/.config/htop/htoprc b/build/root/.config/htop/htoprc similarity index 100% rename from _build/root/.config/htop/htoprc rename to build/root/.config/htop/htoprc diff --git a/_build/root/.profile b/build/root/.profile similarity index 100% rename from _build/root/.profile rename to build/root/.profile diff --git a/_build/usr/bin/fix-apk b/build/usr/bin/fix-apk similarity index 100% rename from _build/usr/bin/fix-apk rename to build/usr/bin/fix-apk diff --git a/_build/usr/bin/lxc-build b/build/usr/bin/lxc-build similarity index 100% rename from _build/usr/bin/lxc-build rename to build/usr/bin/lxc-build diff --git a/_build/usr/bin/lxc-pack b/build/usr/bin/lxc-pack similarity index 100% rename from _build/usr/bin/lxc-pack rename to build/usr/bin/lxc-pack diff --git a/_doc/Makefile b/doc/Makefile similarity index 100% rename from _doc/Makefile rename to doc/Makefile diff --git a/_doc/conf.py b/doc/conf.py similarity index 100% rename from _doc/conf.py rename to doc/conf.py diff --git a/_doc/existing/index.rst b/doc/existing/index.rst similarity index 100% rename from _doc/existing/index.rst rename to doc/existing/index.rst diff --git a/_doc/existing/list.md b/doc/existing/list.md similarity index 100% rename from _doc/existing/list.md rename to doc/existing/list.md diff --git a/_doc/existing/map-services.md b/doc/existing/map-services.md similarity index 100% rename from _doc/existing/map-services.md rename to doc/existing/map-services.md diff --git a/_doc/existing/tech-overview.md b/doc/existing/tech-overview.md similarity index 100% rename from _doc/existing/tech-overview.md rename to doc/existing/tech-overview.md diff --git a/_doc/index.rst b/doc/index.rst similarity index 100% rename from _doc/index.rst rename to doc/index.rst diff --git a/_doc/toolchain/abuild.md b/doc/toolchain/abuild.md similarity index 100% rename from _doc/toolchain/abuild.md rename to doc/toolchain/abuild.md diff --git a/_doc/toolchain/index.rst b/doc/toolchain/index.rst similarity index 100% rename from _doc/toolchain/index.rst rename to doc/toolchain/index.rst diff --git a/_doc/toolchain/lxc-build.md b/doc/toolchain/lxc-build.md similarity index 100% rename from _doc/toolchain/lxc-build.md rename to doc/toolchain/lxc-build.md diff --git a/_doc/toolchain/lxc-overview.md b/doc/toolchain/lxc-overview.md similarity index 100% rename from _doc/toolchain/lxc-overview.md rename to doc/toolchain/lxc-overview.md diff --git a/_doc/toolchain/lxc-pack.md b/doc/toolchain/lxc-pack.md similarity index 100% rename from _doc/toolchain/lxc-pack.md rename to doc/toolchain/lxc-pack.md diff --git a/_doc/toolchain/pkgmgr.md b/doc/toolchain/pkgmgr.md similarity index 100% rename from _doc/toolchain/pkgmgr.md rename to doc/toolchain/pkgmgr.md diff --git a/_doc/toolchain/vm-creation.md b/doc/toolchain/vm-creation.md similarity index 96% rename from _doc/toolchain/vm-creation.md rename to doc/toolchain/vm-creation.md index d0415d2..47edaa5 100644 --- a/_doc/toolchain/vm-creation.md +++ b/doc/toolchain/vm-creation.md @@ -20,7 +20,7 @@ setup-interfaces ifup eth0 # Download and launch the setup script -wget repo.spotter.cz/_vm.sh +wget repo.spotter.cz/vm.sh sh _vm.sh ``` @@ -36,7 +36,7 @@ Follow the VM creation steps as above. Once the VM is built and restarted, log i ```bash # Install git and OpenSSH client -apk --no-cache add git openssh-client +apk add git openssh-client # Create SSH key ssh-keygen -t ecdsa @@ -49,7 +49,7 @@ Assign the newly generated key to your GitLab account git clone --recurse-submodules ssh://git@git.spotter.cz:2222/Spotter-Cluster/Spotter-Cluster.git # Install the build toolchain -Spotter-Cluster/_build/install-toolchain.sh +Spotter-Cluster/build/install-toolchain.sh ``` ### Building the packages diff --git a/_doc/toolchain/vmmgr-hooks.md b/doc/toolchain/vmmgr-hooks.md similarity index 100% rename from _doc/toolchain/vmmgr-hooks.md rename to doc/toolchain/vmmgr-hooks.md diff --git a/_extra/frontlinesms-lang-js.py b/extra/frontlinesms-lang-js.py similarity index 100% rename from _extra/frontlinesms-lang-js.py rename to extra/frontlinesms-lang-js.py diff --git a/_extra/myip.php b/extra/myip.php similarity index 100% rename from _extra/myip.php rename to extra/myip.php diff --git a/_extra/sahana-lang-csv.py b/extra/sahana-lang-csv.py similarity index 100% rename from _extra/sahana-lang-csv.py rename to extra/sahana-lang-csv.py diff --git a/_extra/vm-ping.php b/extra/vm-ping.php similarity index 100% rename from _extra/vm-ping.php rename to extra/vm-ping.php diff --git a/_vm.sh b/vm.sh similarity index 97% rename from _vm.sh rename to vm.sh index f233e64..5b4cdaa 100755 --- a/_vm.sh +++ b/vm.sh @@ -85,7 +85,7 @@ chroot /mnt setup-timezone -z Europe/Prague # Install basic system apk --no-cache add apache2-utils gettext -wget https://repo.spotter.cz/_vm.tar -O - | tar xf - -C /mnt +wget https://repo.spotter.cz/vm.tar -O - | tar xf - -C /mnt chroot /mnt apk --no-cache add bridge ca-certificates curl e2fsprogs-extra gettext iptables kbd-misc libressl lxc postfix nginx openssh-server openssh-sftp-server util-linux wireguard-virt@vm wireguard-tools-wg@vm acme-sh@vm vmmgr@vm chroot /mnt newaliases mkdir -p /mnt/var/log/lxc diff --git a/_vm/boot/extlinux.conf b/vm/boot/extlinux.conf similarity index 100% rename from _vm/boot/extlinux.conf rename to vm/boot/extlinux.conf diff --git a/_vm/boot/vm.txt b/vm/boot/vm.txt similarity index 100% rename from _vm/boot/vm.txt rename to vm/boot/vm.txt diff --git a/_vm/etc/apk/keys/repokey.rsa.pub b/vm/etc/apk/keys/repokey.rsa.pub similarity index 100% rename from _vm/etc/apk/keys/repokey.rsa.pub rename to vm/etc/apk/keys/repokey.rsa.pub diff --git a/_vm/etc/apk/repositories b/vm/etc/apk/repositories similarity index 100% rename from _vm/etc/apk/repositories rename to vm/etc/apk/repositories diff --git a/_vm/etc/conf.d/consolefont b/vm/etc/conf.d/consolefont similarity index 100% rename from _vm/etc/conf.d/consolefont rename to vm/etc/conf.d/consolefont diff --git a/_vm/etc/conf.d/iptables b/vm/etc/conf.d/iptables similarity index 100% rename from _vm/etc/conf.d/iptables rename to vm/etc/conf.d/iptables diff --git a/_vm/etc/hostname b/vm/etc/hostname similarity index 100% rename from _vm/etc/hostname rename to vm/etc/hostname diff --git a/_vm/etc/hosts b/vm/etc/hosts similarity index 100% rename from _vm/etc/hosts rename to vm/etc/hosts diff --git a/_vm/etc/inittab b/vm/etc/inittab similarity index 100% rename from _vm/etc/inittab rename to vm/etc/inittab diff --git a/_vm/etc/iptables/rules-save b/vm/etc/iptables/rules-save similarity index 100% rename from _vm/etc/iptables/rules-save rename to vm/etc/iptables/rules-save diff --git a/_vm/etc/network/interfaces b/vm/etc/network/interfaces similarity index 100% rename from _vm/etc/network/interfaces rename to vm/etc/network/interfaces diff --git a/_vm/etc/nginx/conf.d/default.conf b/vm/etc/nginx/conf.d/default.conf similarity index 100% rename from _vm/etc/nginx/conf.d/default.conf rename to vm/etc/nginx/conf.d/default.conf diff --git a/_vm/etc/nginx/nginx.conf b/vm/etc/nginx/nginx.conf similarity index 100% rename from _vm/etc/nginx/nginx.conf rename to vm/etc/nginx/nginx.conf diff --git a/_vm/etc/postfix/main.cf b/vm/etc/postfix/main.cf similarity index 100% rename from _vm/etc/postfix/main.cf rename to vm/etc/postfix/main.cf diff --git a/_vm/etc/rc.conf b/vm/etc/rc.conf similarity index 100% rename from _vm/etc/rc.conf rename to vm/etc/rc.conf diff --git a/_vm/etc/ssl/services.key b/vm/etc/ssl/services.key similarity index 100% rename from _vm/etc/ssl/services.key rename to vm/etc/ssl/services.key diff --git a/_vm/etc/ssl/services.pem b/vm/etc/ssl/services.pem similarity index 100% rename from _vm/etc/ssl/services.pem rename to vm/etc/ssl/services.pem diff --git a/_vm/etc/wireguard/wg0.conf.disabled b/vm/etc/wireguard/wg0.conf.disabled similarity index 100% rename from _vm/etc/wireguard/wg0.conf.disabled rename to vm/etc/wireguard/wg0.conf.disabled diff --git a/_vm/sbin/extend-disk b/vm/sbin/extend-disk similarity index 100% rename from _vm/sbin/extend-disk rename to vm/sbin/extend-disk diff --git a/_vm/sbin/vmtty b/vm/sbin/vmtty similarity index 100% rename from _vm/sbin/vmtty rename to vm/sbin/vmtty