From c6255e01729f4adec2d643bad37d9a04c07ffef1 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Fri, 2 Jul 2021 11:43:13 +0200 Subject: [PATCH] add docker; fix ssh --- .gitmodules | 3 +++ build-pkg/pkglist-de-p1st.txt | 2 +- pkg/de-p1st-docker/.install | 10 ++++++++++ pkg/de-p1st-docker/PKGBUILD | 21 +++++++++++++++++++++ pkg/de-p1st-docker/systemd.preset | 1 + pkg/de-p1st-ssh/PKGBUILD | 2 +- pkg/de-p1st-ssh/sshd_config.holoscript | 20 ++++++++++---------- pkg/signal-desktop-minimized | 1 + 8 files changed, 48 insertions(+), 12 deletions(-) create mode 100644 pkg/de-p1st-docker/.install create mode 100644 pkg/de-p1st-docker/PKGBUILD create mode 100644 pkg/de-p1st-docker/systemd.preset create mode 160000 pkg/signal-desktop-minimized diff --git a/.gitmodules b/.gitmodules index 33c2250..01248a6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -253,3 +253,6 @@ [submodule "pkg/toggle-bluetooth"] path = pkg/toggle-bluetooth url = https://aur.archlinux.org/toggle-bluetooth.git +[submodule "pkg/signal-desktop-minimized"] + path = pkg/signal-desktop-minimized + url = https://aur.archlinux.org/signal-desktop-minimized.git diff --git a/build-pkg/pkglist-de-p1st.txt b/build-pkg/pkglist-de-p1st.txt index e042737..4b67e1b 100644 --- a/build-pkg/pkglist-de-p1st.txt +++ b/build-pkg/pkglist-de-p1st.txt @@ -1,4 +1,4 @@ -de-p1st-zoom de-p1st-rotate de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-sddm-autologin-placeholder de-p1st-sddm-autologin-yoda de-p1st-sddm-theme-default de-p1st-sddm-theme-nordic de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo de-p1st-ssh-key-placeholder de-p1st-ssh-key-yoda +de-p1st-docker de-p1st-zoom de-p1st-rotate de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-sddm-autologin-placeholder de-p1st-sddm-autologin-yoda de-p1st-sddm-theme-default de-p1st-sddm-theme-nordic de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo de-p1st-ssh-key-placeholder de-p1st-ssh-key-yoda de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns de-p1st-ssh de-p1st-base de-p1st-xfce4 diff --git a/pkg/de-p1st-docker/.install b/pkg/de-p1st-docker/.install new file mode 100644 index 0000000..21cb3d8 --- /dev/null +++ b/pkg/de-p1st-docker/.install @@ -0,0 +1,10 @@ +## arg 1: the new package version +post_install() { + systemctl preset-all +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + systemctl preset-all +} diff --git a/pkg/de-p1st-docker/PKGBUILD b/pkg/de-p1st-docker/PKGBUILD new file mode 100644 index 0000000..073e762 --- /dev/null +++ b/pkg/de-p1st-docker/PKGBUILD @@ -0,0 +1,21 @@ +# Maintainer: Daniel Langbein +_pkgname=docker +_reponame=arch +pkgname="de-p1st-$_pkgname" +pkgver=0.0.1 +pkgrel=1 +pkgdesc="docker and docker-compose" +arch=('any') +url="https://codeberg.org/privacy1st/${_reponame}" +license=('MIT') +depends=('docker' 'docker-compose') +makedepends=('git') +install='.install' +source=("git+${url}.git") +sha256sums=('SKIP') + +package() { + cd "${_reponame}/pkg/${pkgname}" + + install -Dm0644 systemd.preset "$pkgdir"/usr/lib/systemd/system-preset/20-"$pkgname".preset +} diff --git a/pkg/de-p1st-docker/systemd.preset b/pkg/de-p1st-docker/systemd.preset new file mode 100644 index 0000000..12d984b --- /dev/null +++ b/pkg/de-p1st-docker/systemd.preset @@ -0,0 +1 @@ +enable docker.service \ No newline at end of file diff --git a/pkg/de-p1st-ssh/PKGBUILD b/pkg/de-p1st-ssh/PKGBUILD index ffeee4c..0797e91 100644 --- a/pkg/de-p1st-ssh/PKGBUILD +++ b/pkg/de-p1st-ssh/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=ssh _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.0.5 +pkgver=0.0.6 pkgrel=1 pkgdesc="ssh with configuration" arch=('any') diff --git a/pkg/de-p1st-ssh/sshd_config.holoscript b/pkg/de-p1st-ssh/sshd_config.holoscript index a4c91f3..8da8a8c 100644 --- a/pkg/de-p1st-ssh/sshd_config.holoscript +++ b/pkg/de-p1st-ssh/sshd_config.holoscript @@ -8,16 +8,16 @@ stdin=$(cat) # assertions echo "$stdin" | grep --quiet '^UsePAM yes$' # -echo "$stdin" | grep --quiet '^#PermitRootLogin\s.*$' -echo "$stdin" | grep --quiet '^#PubkeyAuthentication\s.*$' -echo "$stdin" | grep --quiet '^#PasswordAuthentication\s.*$' -echo "$stdin" | grep --quiet '^#PermitEmptyPasswords\s.*$' -echo "$stdin" | grep --quiet '^#X11Forwarding\s.*$' +echo "$stdin" | grep --quiet '^#PermitRootLogin\s*$' +echo "$stdin" | grep --quiet '^#PubkeyAuthentication\s*$' +echo "$stdin" | grep --quiet '^#PasswordAuthentication\s*$' +echo "$stdin" | grep --quiet '^#PermitEmptyPasswords\s*$' +echo "$stdin" | grep --quiet '^#X11Forwarding\s*$' sed ' - s|^#PermitRootLogin\s.*$|PermitRootLogin no|; - s|^#PubkeyAuthentication\s.*$|PubkeyAuthentication yes|; - s|^#PasswordAuthentication\s.*$|PasswordAuthentication no|; - s|^#PermitEmptyPasswords\s.*$|PermitEmptyPasswords no|; - s|^#X11Forwarding\s.*$|X11Forwarding no| + s|^#PermitRootLogin\s*$|PermitRootLogin no|; + s|^#PubkeyAuthentication\s*$|PubkeyAuthentication yes|; + s|^#PasswordAuthentication\s*$|PasswordAuthentication no|; + s|^#PermitEmptyPasswords\s*$|PermitEmptyPasswords no|; + s|^#X11Forwarding\s*$|X11Forwarding no| ' <<< "$stdin" diff --git a/pkg/signal-desktop-minimized b/pkg/signal-desktop-minimized new file mode 160000 index 0000000..a10a88b --- /dev/null +++ b/pkg/signal-desktop-minimized @@ -0,0 +1 @@ +Subproject commit a10a88b624fb34e6a368c0fad5627414189bc11c