diff --git a/APKBUILD b/APKBUILD index 6f3b473..76241fd 100644 --- a/APKBUILD +++ b/APKBUILD @@ -1,19 +1,18 @@ # Maintainer: LinuxSquare pkgname=pterodactyl-panel-compose pkgver=1.11.9 -pkgrel=0 +pkgrel=1 pkgdesc="The Pterodactyl Panel" arch="x86_64" url="https://pterodactyl.io/" license="MIT" optdepends="podman docker" # Install either podman or docker makedepends="go" -install="$pkgname.post-install $pkgname.post-deinstall" options="!check" package() { DESTDIR="$pkgdir" make install local compose_path=$(find $pkgdir -name docker-compose.yml -exec dirname {} \; | sed "s|$pkgdir||") sed -i "s|%VERSION%|$pkgver|" "${pkgdir}${compose_path}/docker-compose.yml" - chown -R 1337:1337 "${pkgdir}${compose_path}" + chown -R 2000:2000 "${pkgdir}${compose_path}" } diff --git a/Makefile b/Makefile index 42146ee..6ca9f61 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,15 @@ -PREFIX ?= /usr -SHARE_DIR=$(PREFIX)/share +PODMAN_DIR=/opt/podman APP_TIMEZONE=$(shell readlink /etc/localtime | awk -F'/' '{print $$(NF-1)"/"$$(NF)}') MYSQL_PASSWORD=$(shell head /dev/urandom | tr -dc 'A-Za-z0-9!?,.$%&+-:<=>@_' | head -c32) MYSQL_ROOT_PASSWORD=$(shell head /dev/urandom | tr -dc 'A-Za-z0-9!?,.$%&+-:<=>@_' | head -c32) -install: install-compose install-service +install: install-compose install-compose: - install -vDm 755 docker-compose.yml.in "$(DESTDIR)$(SHARE_DIR)/pterodactyl-panel/docker-compose.yml" - sed -i "s|%APP_TIMEZONE%|$(APP_TIMEZONE)|g" "$(DESTDIR)$(SHARE_DIR)/pterodactyl-panel/docker-compose.yml" - sed -i "s|%MYSQL_PASSWORD%|$(MYSQL_PASSWORD)|g" "$(DESTDIR)$(SHARE_DIR)/pterodactyl-panel/docker-compose.yml" - sed -i "s|%MYSQL_ROOT_PASSWORD%|$(MYSQL_ROOT_PASSWORD)|g" "$(DESTDIR)$(SHARE_DIR)/pterodactyl-panel/docker-compose.yml" - -install-service: - install -vDm 755 pterodactyl-panel-compose.initd.in "$(DESTDIR)/etc/init.d/pterodactyl-panel-compose" - sed -i "s|%COMPOSEPATH%|$(SHARE_DIR)/pterodactyl-panel/docker-compose.yml|g" "$(DESTDIR)/etc/init.d/pterodactyl-panel-compose" + install -vDm 755 docker-compose.yml.in "$(DESTDIR)$(PODMAN_DIR)/pterodactyl-panel/docker-compose.yml" + sed -i "s|%APP_TIMEZONE%|$(APP_TIMEZONE)|g" "$(DESTDIR)$(PODMAN_DIR)/pterodactyl-panel/docker-compose.yml" + sed -i "s|%MYSQL_PASSWORD%|$(MYSQL_PASSWORD)|g" "$(DESTDIR)$(PODMAN_DIR)/pterodactyl-panel/docker-compose.yml" + sed -i "s|%MYSQL_ROOT_PASSWORD%|$(MYSQL_ROOT_PASSWORD)|g" "$(DESTDIR)$(PODMAN_DIR)/pterodactyl-panel/docker-compose.yml" .PHONY: install diff --git a/pterodactyl-panel-compose.initd.in b/pterodactyl-panel-compose.initd.in deleted file mode 100644 index 2a7a38f..0000000 --- a/pterodactyl-panel-compose.initd.in +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run - -name=$RC_SVCNAME -description="Pterodactyl Panel Containerized" -supervisor="supervise-daemon" - -command="/usr/bin/podman-compose" -command_args="-f %COMPOSEPATH% up -d" -command_user="pterodactyl" - -depend() { - after podman - need podman -} - -stop() { - ebegin "Stopping $RC_SVCNAME" - /usr/bin/podman-compose -f %COMPOSEPATH% down - eend $? -} diff --git a/pterodactyl-panel-compose.post-deinstall b/pterodactyl-panel-compose.post-deinstall deleted file mode 100644 index 114a4ab..0000000 --- a/pterodactyl-panel-compose.post-deinstall +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -deluser pterodactyl 2>/dev/null diff --git a/pterodactyl-panel-compose.post-install b/pterodactyl-panel-compose.post-install deleted file mode 100644 index b3deae4..0000000 --- a/pterodactyl-panel-compose.post-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -addgroup -S -g 1337 pterodactyl 2>/dev/null -adduser -S -h /home/pterodactyl -D -u 1337 -s /bin/bash -G pterodactyl pterodactyl 2>/dev/null - -exit 0