Merge Preparation #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft

alexhulbert wants to merge 5 commits into main from ah/merge-prepare

.dockerignore

This file was deleted.

DEVELOPMENT.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -276,8 +276,8 @@ systemd services are the primary way to run applications in Flashboxes. Here's h
  
    ```ini

    [Unit]

    Description=My Application

    After=network.target network-setup.service

    Requires=network-setup.service

    After=network-online.target

    Wants=network-online.target

    [Service]

    Type=simple

    @@ -354,8 +354,8 @@ Conflicts=apache2.service
  
    ```ini

    [Unit]

    # Network is available

    After=network.target network-setup.service

    Requires=network-setup.service

    After=network-online.target

    Wants=network-online.target

    # Persistent storage is mounted

    After=persistent-mount.service

    @@ -365,24 +365,14 @@ Requires=persistent-mount.service
  
    After=basic.target

    ```

    ### Enabling Services

    ### Enabling Packaged Services

    **In `mkosi.postinst` script**:

    ```bash

    #!/bin/bash

    set -euxo pipefail

    To enable a service installed with a Debian package, add the following to your `mkosi.postinst` script:

    # Enable service

    mkosi-chroot systemctl enable myapp.service

    # Create symlink for minimal.target

    mkdir -p "$BUILDROOT/etc/systemd/system/minimal.target.wants"

    ln -sf "/etc/systemd/system/myapp.service" \

        "$BUILDROOT/etc/systemd/system/minimal.target.wants/"

    ```bash

    mkosi-chroot systemctl add-wants minimal.target myapp.service

    ```

    For comprehensive systemd options, see: [systemd Service Documentation](https://www.freedesktop.org/software/systemd/man/systemd.service.html)

    ## Extending Built-in systemd Services

    Sometimes you need to modify existing systemd services rather than creating new ones.

    @@ -543,8 +533,7 @@ chown myapp:myapp /etc/myapp/config.conf
  
    chmod 600 /etc/myapp/config.conf

    # Enable systemd service

    systemctl enable myapp.service || true

    systemctl start myapp.service || true

    mkosi-chroot systemctl add-wants minimal.target myapp.service || true

    exit 0

    ```

Dockerfile

This file was deleted.

base/debloat-systemd.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,8 @@ systemd_svc_whitelist=( @@
         "systemd-journald-dev-log.socket"
         "systemd-remount-fs.service"
         "systemd-sysctl.service"
+        "systemd-networkd.service"
+        "systemd-networkd.socket"
         "chrony.service"
     )
@@ Expand All @@
         fi
     done
-    # Set default target
-    ln -sf minimal.target "$SYSTEMD_DIR/default.target"
-    # Enable chrony and link to minimal.target
-    mkdir -p "$BUILDROOT/etc/systemd/system/minimal.target.wants"
-    mkosi-chroot systemctl enable chrony.service
-    ln -sf /lib/systemd/system/chrony.service "$BUILDROOT/etc/systemd/system/minimal.target.wants/"
+    # Enable chrony service
+    mkosi-chroot systemctl add-wants minimal.target \
+        chrony.service \
+        systemd-resolved.service \
+        systemd-networkd.service

base/debloat.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -31,10 +31,8 @@ debloat_paths=( @@
         "/usr/lib/systemd/catalog"
         "/usr/lib/systemd/user"
         "/usr/lib/systemd/user-generators"
-        "/usr/lib/systemd/network"
         "/usr/lib/pcrlock.d"
         "/usr/lib/tmpfiles.d"
-        "/etc/systemd/network"
         "/etc/credstore"
         "/nix"
     )
@@ Expand Down @@

base/mkosi.conf

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -17,8 +17,8 @@ Seed=630b5f72-a36a-4e83-b23d-6ef47c82fd9c
  
    [Content]

    SourceDateEpoch=0

    KernelCommandLine=console=tty0 console=ttyS0,115200n8 mitigations=auto,nosmt spec_store_bypass_disable=on nospectre_v2

    SkeletonTrees=base/mkosi.skeleton

    KernelCommandLine=console=tty0 console=ttyS0,115200n8 mitigations=auto,nosmt spec_store_bypass_disable=on nospectre_v2 systemd.unit=minimal.target

    ExtraTrees=base/mkosi.extra

    BuildScripts=kernel/mkosi.build

    PostInstallationScripts=base/debloat-systemd.sh

    PostInstallationScripts=base/efi-stub.sh

    @@ -30,14 +30,14 @@ SyncScripts=base/normalize-umask.sh
  
    CleanPackageMetadata=true

    Packages=kmod

             systemd

             systemd-resolved

             systemd-boot-efi

             busybox

             util-linux

             procps

             ca-certificates

             openssl

             iproute2

             udhcpc

             e2fsprogs

             chrony

    BuildPackages=build-essential

0 base/mkosi.skeleton/etc/chrony/chrony.conf → base/mkosi.extra/etc/chrony/chrony.conf

File renamed without changes.

base/mkosi.extra/etc/systemd/journald.conf

-Original file line number
+Diff line change
@@ -0,0 +1,5 @@
+    [Journal]
+    SystemMaxFileSize=128M
+    SystemMaxFiles=2
+    RuntimeMaxFileSize=512K
+    RuntimeMaxFiles=2

base/mkosi.extra/etc/systemd/network/10-ethernet.network

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    [Match]
+    Name=eth* en*
+    [Network]
+    DHCP=yes
+    [DHCPv4]
+    UseDNS=no
+    UseHostname=no

base/mkosi.extra/etc/systemd/resolved.conf

-Original file line number
+Diff line change
@@ -0,0 +1,4 @@
+    [Resolve]
+    # GCP: 169.254.169.254, Azure: 168.63.129.16
+    DNS=169.254.169.254 168.63.129.16
+    FallbackDNS=1.1.1.1 1.0.0.1

...keleton/etc/systemd/system/minimal.target → ...i.extra/etc/systemd/system/minimal.target

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,3 @@ Requires=basic.target @@
     Conflicts=rescue.service rescue.target emergency.service emergency.target
     After=basic.target rescue.service rescue.target emergency.service emergency.target
     AllowIsolate=yes
-    [Install]
-    WantedBy=default.target

base/mkosi.skeleton/init → base/mkosi.extra/init

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,4 @@ exec unshare --mount sh -c ' @@
         mkdir /@
         mount --rbind / /@
         cd /@ && mount --move . /
-        exec chroot . /lib/systemd/systemd systemd.unit=minimal.target'
+        exec chroot . /lib/systemd/systemd'

base/mkosi.skeleton/etc/resolv.conf

This file was deleted.

base/mkosi.skeleton/etc/systemd/system/network-setup.service

This file was deleted.

bob-common/mkosi.extra/etc/systemd/system/dropbear.service.d/dropbear-prereq.conf

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,3 @@ Requires=wait-for-key.service searcher-firewall.service @@
     [Service]
     ExecStartPre=/usr/bin/chown -R searcher:searcher /home/searcher
     ExecStartPre=/bin/sh -c 'test -f /etc/dropbear/dropbear_ed25519_host_key || /usr/bin/dropbearkey -t ed25519 -f /etc/dropbear/dropbear_ed25519_host_key'
-    [Install]
-    WantedBy=minimal.target

...c/systemd/system/persistent-mount.service → ...c/systemd/system/persistent-mount.service

-Original file line number
+Diff line change
@@ Expand Up @@
     RemainAfterExit=yes
     [Install]
-    WantedBy=minimal.target
+    WantedBy=minimal.target

bob-common/mkosi.extra/etc/systemd/system/searcher-firewall.service

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,7 +1,7 @@
  
    [Unit]

    Description=Searcher Network and Firewall Rules

    After=network.target network-setup.service

    Requires=network-setup.service

    After=network-online.target

    Wants=network-online.target

    [Service]

    Type=oneshot

bob-common/mkosi.extra/etc/systemd/system/wait-for-key.service

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,7 +1,7 @@
  
    [Unit]

    Description=SSH Public Key Server

    After=network.target network-setup.service wait-for-key.service

    Requires=network-setup.service

    After=network-online.target

    Wants=network-online.target

    [Service]

    Type=oneshot

bob-common/mkosi.postinst

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,25 +18,13 @@ mkdir -p "$BUILDROOT/etc/searcher/ssh_hostkey" @@
     rm -r "$BUILDROOT/etc/dropbear"
     mkdir "$BUILDROOT/etc/dropbear"
-    # Enable services
-    mkdir -p "$BUILDROOT/etc/systemd/system/minimal.target.wants"
-    for service in \
-        network-setup.service \
+    # Enable packaged services
+    mkosi-chroot systemctl add-wants minimal.target \
         logrotate.timer \
         delay-pipe.service \
-        wait-for-key.service \
-        searcher-firewall.service \
-        dropbear.service \
-        searcher-container.service \
-        ssh-pubkey-server.service \
-        cvm-reverse-proxy.service
-    do
-        mkosi-chroot systemctl enable "$service"
-        ln -sf "/etc/systemd/system/$service" "$BUILDROOT/etc/systemd/system/minimal.target.wants/"
-    done
+        dropbear.service
     # Don't reserve port 22
-    mkosi-chroot systemctl disable ssh.service ssh.socket
     mkosi-chroot systemctl mask ssh.service ssh.socket
     # Lock the root account
@@ Expand Down @@

bob-l1/mkosi.extra/etc/systemd/system/lighthouse.service

-Original file line number
+Diff line change
@@ -1,7 +1,8 @@
     [Unit]
     Description=Lighthouse Consensus Client
-    After=network.target network-setup.service persistent-mount.service
-    Requires=network-setup.service persistent-mount.service
+    After=network-online.target persistent-mount.service
+    Wants=network-online.target
+    Requires=persistent-mount.service
     [Service]
     Type=exec
@@ Expand Down @@

0 services/bin/lighthouse-init → bob-l1/mkosi.extra/usr/bin/lighthouse-init

File renamed without changes.

bob-l1/mkosi.postinst

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,14 +7,4 @@ set -euxo pipefail @@
     mkosi-chroot groupadd -r eth
     mkosi-chroot useradd -r -s /bin/false -G eth lighthouse
-    # Install lighthouse
-    install -m 755 services/bin/lighthouse-init "$BUILDROOT/usr/bin/"
-    # Enable services
-    mkdir -p "$BUILDROOT/etc/systemd/system/minimal.target.wants"
-    for service in \
-        lighthouse.service
-    do
-        mkosi-chroot systemctl enable "$service"
-        ln -sf "/etc/systemd/system/$service" "$BUILDROOT/etc/systemd/system/minimal.target.wants/"
-    done
+    mkosi-chroot systemctl add-wants minimal.target lighthouse

bob-l1/readme.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -601,9 +601,9 @@ Developer Notes
  
    ### Service Order

    1. Initialize network (**name:** `network-setup.service`)

    2. Get searcher key from LUKS partition or wait for key on port 8080 (**name:** `wait-for-key.service`) (**after:** `network-setup.service`)

    3. Setup firewall (**name:** `searcher-firewall.service`) (**after:** `network-setup.service`)

    1. Initialize network via `systemd-networkd.service`

    2. Get searcher key from LUKS partition or wait for key on port 8080 (**name:** `wait-for-key.service`) (**after:** `network-online.target`)

    3. Setup firewall (**name:** `searcher-firewall.service`) (**after:** `network-online.target`)

    4. Start dropbear server for `initialize`, `toggle`, etc. (**name:** `dropbear.service`) (**after:** `wait-for-key.service`, `searcher-firewall.service`)

    5. Open a log socket and forward text from it to the delayed log file after 300s (**name:** searcher-log-reader.service) (**after:** `/persistent` is mounted)

    6. Write new text in `bob.log` to the log socket (**name:** searcher-log-writer.service) (**after:** searcher-log-reader.service)

bob-l2/mkosi.extra/etc/systemd/system/fetch-config.service

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,7 +1,7 @@
  
    [Unit]

    Description=Fetch some configuration variables from Vault

    After=network.target network-setup.service

    Requires=network-setup.service

    After=network-online.target

    Wants=network-online.target

    [Service]

    Type=oneshot

buildernet.conf

This file was deleted.

buildernet/mkosi.build

This file was deleted.

buildernet/mkosi.conf

This file was deleted.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge Preparation #92

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Merge Preparation #92

Are you sure you want to change the base?

Uh oh!

Merge Preparation #92

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!