new website

11 files changed, 18 insertions, 85 deletions

diff --git a/gnix-git/PKGBUILD b/gnix-git/PKGBUILD
index ecf8d65..c04a0da 100644
--- a/gnix-git/PKGBUILD
+++ b/gnix-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=gnix-git
-pkgver=r162.f4042f7
+pkgver=r165.06e736c
 pkgrel=1
 pkgdesc="a simple stupid http reverse proxy"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
@@ -37,7 +37,7 @@ build() {
     cargo +nightly build --frozen --release --target "$(rust_chost)"
 }
 package() {
-    install -Dm755 gnix/target/$(rust_chost)/release/gnix "$pkgdir/usr/bin/gnix"
+    install -Dm755 gnix/target/"$(rust_chost)"/release/gnix "$pkgdir/usr/bin/gnix"
     install -Dm644 gnix/src/modules/auth/login.html "$pkgdir/usr/share/gnix/login.html"
     install -Dm644 config.yaml "$pkgdir/etc/gnix.yaml"
     install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/gnix.conf"
diff --git a/gnix/PKGBUILD b/gnix/PKGBUILD
index 4a35ee4..b1fbaed 100644
--- a/gnix/PKGBUILD
+++ b/gnix/PKGBUILD
@@ -31,7 +31,7 @@ build() {
     cargo +nightly build --frozen --release --target "$(rust_chost)"
 }
 package() {
-    install -Dm755 gnix/target/$(rust_chost)/release/gnix "$pkgdir/usr/bin/gnix"
+    install -Dm755 gnix/target/"$(rust_chost)"/release/gnix "$pkgdir/usr/bin/gnix"
     install -Dm644 gnix/src/modules/auth/login.html "$pkgdir/usr/share/gnix/login.html"
     install -Dm644 config.yaml "$pkgdir/etc/gnix.yaml"
     install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/gnix.conf"
diff --git a/hurrycurry-client-git/PKGBUILD b/hurrycurry-client-git/PKGBUILD
index 3d809c9..fda7724 100644
--- a/hurrycurry-client-git/PKGBUILD
+++ b/hurrycurry-client-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=hurrycurry-client-git
-pkgver=r2312.64075a8c
+pkgver=r2526.10bd0b8a
 pkgrel=1
 pkgdesc="A game about cooking (client)"
 arch=('any')
diff --git a/hurrycurry-client-web-git/PKGBUILD b/hurrycurry-client-web-git/PKGBUILD
index fc0ddbb..8297ef3 100644
--- a/hurrycurry-client-web-git/PKGBUILD
+++ b/hurrycurry-client-web-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=hurrycurry-client-web-git
-pkgver=r2314.732850db
+pkgver=r2462.46897ebd
 pkgrel=1
 pkgdesc="A game about cooking (web client)"
 arch=('any')
diff --git a/hurrycurry-server-git/PKGBUILD b/hurrycurry-server-git/PKGBUILD
index 53dd696..703ef70 100644
--- a/hurrycurry-server-git/PKGBUILD
+++ b/hurrycurry-server-git/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=hurrycurry-server-git
-pkgver=r2314.732850db
-pkgrel=3
+pkgver=r2526.10bd0b8a
+pkgrel=1
 pkgdesc="A game about cooking (server)"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 url="https://codeberg.org/hurrycurry/hurrycurry"
diff --git a/hurrycurry-standalone-files-git/PKGBUILD b/hurrycurry-standalone-files-git/PKGBUILD
index 19685a3..e9449e4 100644
--- a/hurrycurry-standalone-files-git/PKGBUILD
+++ b/hurrycurry-standalone-files-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=hurrycurry-standalone-files-git
-pkgver=r2312.64075a8c
+pkgver=r2462.46897ebd
 pkgrel=1
 pkgdesc="A game about cooking (standalone files (git))"
 arch=('any')
diff --git a/hurrycurry-website-git/PKGBUILD b/hurrycurry-website-git/PKGBUILD
index 462b187..4014d49 100644
--- a/hurrycurry-website-git/PKGBUILD
+++ b/hurrycurry-website-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=hurrycurry-website-git
-pkgver=r30.d349363
+pkgver=r33.7430b9c
 pkgrel=1
 pkgdesc="Hurrycurry website files"
 arch=('any')
diff --git a/metamuffin-blog-git/PKGBUILD b/metamuffin-blog-git/PKGBUILD
deleted file mode 100644
index b3dddcb..0000000
--- a/metamuffin-blog-git/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: metamuffin <metamuffin@disroot.org>
-
-pkgname=metamuffin-blog-git
-pkgver=r66.db05974
-pkgrel=1
-pkgdesc="metamuffins blog"
-arch=('any')
-url="https://codeberg.org/metamuffin/metamuffin-blog"
-license=('CC-BY-SA')
-makedepends=('rustup')
-source=("git+https://codeberg.org/metamuffin/metamuffin-blog.git")
-sha256sums=("SKIP")
-
-pkgver() {
-    cd "metamuffin-blog"
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-package() {
-    mkdir -p "$pkgdir/usr/share/metamuffin-website"
-    cp -rf metamuffin-blog "$pkgdir/usr/share/metamuffin-website/blog";
-}
diff --git a/metamuffin-website-git/PKGBUILD b/metamuffin-website-git/PKGBUILD
index 19aefeb..fc84eda 100644
--- a/metamuffin-website-git/PKGBUILD
+++ b/metamuffin-website-git/PKGBUILD
@@ -1,23 +1,15 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=metamuffin-website-git
-pkgver=r76.fbc308f
+pkgver=r88.4456239
 pkgrel=1
-pkgdesc="metamuffins personal webpage"
-arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
+pkgdesc="metamuffin's personal webpage"
+arch=('any')
 url="https://codeberg.org/metamuffin/metamuffin-website"
 license=('AGPL3')
 makedepends=('rustup')
-source=("git+https://codeberg.org/metamuffin/metamuffin-website.git"
-        "metamuffin-website.service"
-        "sysusers.conf")
-sha256sums=("SKIP"
-            "SKIP"
-            "SKIP")
-
-rust_chost() {
-	sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST"
-}
+source=("git+https://codeberg.org/metamuffin/metamuffin-website.git")
+sha256sums=("SKIP")
 
 pkgver() {
     cd "metamuffin-website"
@@ -25,17 +17,13 @@ pkgver() {
 }
 prepare() {
     cd "metamuffin-website"
-    rustup default nightly
-    cargo +nightly fetch --locked --target "$(rust_chost)"
+    make clean
 }
 build() {
     cd "metamuffin-website"
-    cargo +nightly build --frozen --release --target "$(rust_chost)"
+    make all
 }
 package() {
-    mkdir -p "$pkgdir/usr/share/metamuffin-website"
-    install -Dm755 metamuffin-website/target/$(rust_chost)/release/metamuffin-website "$pkgdir/usr/bin/metamuffin-website"
-    install -Dm644 metamuffin-website.service "$pkgdir/usr/lib/systemd/system/metamuffin-website.service"
-    install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/metamuffin-website.conf"
-    install -Dm644 metamuffin-website/COPYING "$pkgdir/usr/share/licenses/metamuffin-website/COPYING"
+    cd "metamuffin-website"
+    make install PREFIX="$pkgdir/usr/share/webapps/metamuffin-website"
 }
diff --git a/metamuffin-website-git/metamuffin-website.service b/metamuffin-website-git/metamuffin-website.service
deleted file mode 100644
index 4195d98..0000000
--- a/metamuffin-website-git/metamuffin-website.service
+++ /dev/null
@@ -1,33 +0,0 @@
-[Unit]
-Description=metamuffin personal website
-After=network.target
-Wants=network-online.target
-
-[Service]
-WorkingDirectory=/usr/share/metamuffin-website
-ExecStart=/usr/bin/metamuffin-website
-User=metamuffin_website
-LockPersonality=yes
-MemoryDenyWriteExecute=yes
-NoNewPrivileges=yes
-PrivateDevices=true
-PrivateTmp=true
-ProtectClock=yes
-ProtectControlGroups=yes
-ProtectHome=true
-ProtectHostname=yes
-ProtectKernelLogs=yes
-ProtectKernelModules=yes
-ProtectKernelTunables=yes
-ProtectSystem=full
-RestrictAddressFamilies=~AF_PACKET AF_NETLINK
-RestrictNamespaces=yes
-RestrictSUIDSGID=yes
-RestrictRealtime=yes
-Restart=always
-SystemCallArchitectures=native
-SystemCallFilter=@system-service
-Type=simple
-
-[Install]
-WantedBy=multi-user.target
diff --git a/metamuffin-website-git/sysusers.conf b/metamuffin-website-git/sysusers.conf
deleted file mode 100644
index 8c70085..0000000
--- a/metamuffin-website-git/sysusers.conf
+++ /dev/null
@@ -1 +0,0 @@
-u metamuffin_website - "metamuffins personal website" - -