Nomenclature & cleanup

aformatik · Mar 25, 2024 · 0f3feda · 0f3feda
1 parent fa3a6ce
commit 0f3feda
Show file tree

Hide file tree

Showing 109 changed files with 2,455 additions and 3,587 deletions.
diff --git a/.github/workflows/website.yml.disabled b/.github/workflows/website.yml.disabled
@@ -3,7 +3,7 @@ name: website
 on:
   push:
      paths:
-      - 'static/website/**'
+      - 'docs/website/**'
 
 permissions:
   contents: write
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: static/website
+        working-directory: docs/website
     steps:
     - uses: actions/checkout@v3
     - uses: cachix/install-nix-action@v22
@@ -28,4 +28,4 @@ jobs:
     - name: Deploy 🚀
       uses: JamesIves/github-pages-deploy-action@v4
       with:
-        folder: static/website/result/
+        folder: docs/website/result/
diff --git a/cli/.ghcid → .old/cli/.ghcid b/cli/.ghcid → .old/cli/.ghcid
diff --git a/cli/.hlint.yaml → .old/cli/.hlint.yaml b/cli/.hlint.yaml → .old/cli/.hlint.yaml
diff --git a/cli/LICENSE → .old/cli/LICENSE b/cli/LICENSE → .old/cli/LICENSE
diff --git a/cli/app/Main.hs → .old/cli/app/Main.hs b/cli/app/Main.hs → .old/cli/app/Main.hs
diff --git a/cli/cabal.project → .old/cli/cabal.project b/cli/cabal.project → .old/cli/cabal.project
diff --git a/cli/codchi.cabal → .old/cli/codchi.cabal b/cli/codchi.cabal → .old/cli/codchi.cabal
diff --git a/cli/src/Codchi.hs → .old/cli/src/Codchi.hs b/cli/src/Codchi.hs → .old/cli/src/Codchi.hs
diff --git a/cli/src/Codchi/CLI.hs → .old/cli/src/Codchi/CLI.hs b/cli/src/Codchi/CLI.hs → .old/cli/src/Codchi/CLI.hs
diff --git a/cli/src/Codchi/Config.hs → .old/cli/src/Codchi/Config.hs b/cli/src/Codchi/Config.hs → .old/cli/src/Codchi/Config.hs
diff --git a/cli/src/Codchi/Config/Common.hs → .old/cli/src/Codchi/Config/Common.hs b/cli/src/Codchi/Config/Common.hs → .old/cli/src/Codchi/Config/Common.hs
diff --git a/cli/src/Codchi/Config/IO.hs → .old/cli/src/Codchi/Config/IO.hs b/cli/src/Codchi/Config/IO.hs → .old/cli/src/Codchi/Config/IO.hs
diff --git a/cli/src/Codchi/Config/V012.hs → .old/cli/src/Codchi/Config/V012.hs b/cli/src/Codchi/Config/V012.hs → .old/cli/src/Codchi/Config/V012.hs
diff --git a/cli/src/Codchi/Error.hs → .old/cli/src/Codchi/Error.hs b/cli/src/Codchi/Error.hs → .old/cli/src/Codchi/Error.hs
diff --git a/cli/src/Codchi/Nix.hs → .old/cli/src/Codchi/Nix.hs b/cli/src/Codchi/Nix.hs → .old/cli/src/Codchi/Nix.hs
diff --git a/cli/src/Codchi/Parser.hs → .old/cli/src/Codchi/Parser.hs b/cli/src/Codchi/Parser.hs → .old/cli/src/Codchi/Parser.hs
diff --git a/cli/src/Codchi/Platform.hs → .old/cli/src/Codchi/Platform.hs b/cli/src/Codchi/Platform.hs → .old/cli/src/Codchi/Platform.hs
diff --git a/cli/src/Codchi/Platform/CodchiMonad.hs → .old/cli/src/Codchi/Platform/CodchiMonad.hs b/cli/src/Codchi/Platform/CodchiMonad.hs → .old/cli/src/Codchi/Platform/CodchiMonad.hs
diff --git a/cli/src/Codchi/Platform/Linux.hs → .old/cli/src/Codchi/Platform/Linux.hs b/cli/src/Codchi/Platform/Linux.hs → .old/cli/src/Codchi/Platform/Linux.hs
diff --git a/cli/src/Codchi/Platform/Windows.hs → .old/cli/src/Codchi/Platform/Windows.hs b/cli/src/Codchi/Platform/Windows.hs → .old/cli/src/Codchi/Platform/Windows.hs
diff --git a/cli/src/Codchi/Platform/Windows/Internal.hs → ...i/src/Codchi/Platform/Windows/Internal.hs b/cli/src/Codchi/Platform/Windows/Internal.hs → ...i/src/Codchi/Platform/Windows/Internal.hs
diff --git a/cli/src/Codchi/Types.hs → .old/cli/src/Codchi/Types.hs b/cli/src/Codchi/Types.hs → .old/cli/src/Codchi/Types.hs
diff --git a/cli/test/Config/v012.json → .old/cli/test/Config/v012.json b/cli/test/Config/v012.json → .old/cli/test/Config/v012.json
diff --git a/cli/test/ConfigSpec.hs → .old/cli/test/ConfigSpec.hs b/cli/test/ConfigSpec.hs → .old/cli/test/ConfigSpec.hs
diff --git a/cli/test/Spec.hs → .old/cli/test/Spec.hs b/cli/test/Spec.hs → .old/cli/test/Spec.hs
diff --git a/controller/ctrl-rootfs.nix → .old/controller/ctrl-rootfs.nix b/controller/ctrl-rootfs.nix → .old/controller/ctrl-rootfs.nix
@@ -17,7 +17,7 @@
 }:
 
 let
-  # These are binaries which are required by WSL before controller
+  # These are binaries which are required by LXD / WSL before controller
   # initialization. They are included in the controller.tar.gz
   staticBinaries = with pkgsStatic; [
     busybox
@@ -50,6 +50,7 @@ callPackage ../nix/make-tarball.nix {
   contents = {
     "/bin/" = toString (map (pkg: "${pkg}/bin/*") staticBinaries);
     "/bin/run" = writeShellScript "run" ''
+      /bin/ctrl-update-certs
       source /etc/profile.d/nix-daemon.sh
       [ ! -d /tmp ] && mkdir /tmp
       exec "$@"
@@ -107,10 +108,5 @@ callPackage ../nix/make-tarball.nix {
           nixpkgs;
       }];
     });
-
-    "/root/.bash_profile" = writeText ".bashrc" ''
-      ctrl-update-certs
-      source /etc/profile.d/nix-daemon.sh
-    '';
   };
 }
diff --git a/controller/default.nix → .old/controller/default.nix b/controller/default.nix → .old/controller/default.nix
@@ -26,7 +26,9 @@
     inherit nixpkgs;
 
     preServeHook = ''
-      source /root/.bash_profile
+      /bin/ctrl-update-certs
+      source /etc/profile.d/nix-daemon.sh
+      [ ! -d /tmp ] && mkdir /tmp
 
       syslogd
       udhcpc -s /usr/share/udhcpc/default.script

diff --git a/controller/etc/group → .old/controller/etc/group b/controller/etc/group → .old/controller/etc/group
diff --git a/controller/etc/nix/nix.conf → .old/controller/etc/nix/nix.conf b/controller/etc/nix/nix.conf → .old/controller/etc/nix/nix.conf
diff --git a/controller/etc/nsswitch.conf → .old/controller/etc/nsswitch.conf b/controller/etc/nsswitch.conf → .old/controller/etc/nsswitch.conf
diff --git a/controller/etc/passwd → .old/controller/etc/passwd b/controller/etc/passwd → .old/controller/etc/passwd
diff --git a/controller/etc/wsl.conf → .old/controller/etc/wsl.conf b/controller/etc/wsl.conf → .old/controller/etc/wsl.conf