bombombom

Author: henderkes

build-packages.sh

@@ -92,7 +92,6 @@ fpm -s dir -t deb -n frankenphp -v "${FRANKENPHP_VERSION}" \
 	--config-files /etc/frankenphp/php.ini \
 	--depends "libc6 (>= ${glibc_version})" \
 	--depends "libstdc++6 (>= ${cxxabi_version})" \
-	--deb-suggests libcap2-bin \
 	--after-install ../package/debian/postinst.sh \
 	--before-remove ../package/debian/prerm.sh \
 	--after-remove ../package/debian/postrm.sh \

package/Caddyfile

@@ -1,4 +1,4 @@
-# The Caddyfile is an easy way to configure your Caddy web server.
+# The Caddyfile is an easy way to configure your Caddy web server.
 #
 # https://caddyserver.com/docs/caddyfile
 # https://frankenphp.dev/docs/config

package/content/example.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 $requestCount = $i ?? 0;
 $requestTime = $duration ?? 0;
 ?>

package/content/public/index.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 
 $i = 0;
 $duration = 0;

package/debian/frankenphp.service

@@ -1,4 +1,4 @@
-# See https://caddyserver.com/docs/install for instructions.
+# See https://caddyserver.com/docs/install for instructions.
 #
 # WARNING: This service does not use the --resume flag, so if you
 # use the API to make changes, they will be overwritten by the

package/debian/postinst.sh

@@ -1,14 +1,6 @@
-#!/bin/sh
+#!/bin/sh
 set -e
 
-if command -v setcap >/dev/null 2>&1; then
-	setcap 'cap_net_bind_service=+ep' /usr/bin/frankenphp || echo "Warning: failed to set capabilities on frankenphp"
-	echo "Users without root privileges will not be to run 'frankenphp php-server' on ports 80/443."
-else
-  echo "Warning: setcap not found. Install it with: sudo apt install libcap2-bin"
-	echo "Users without root privileges will not be to run 'frankenphp php-server' on ports 80/443."
-fi
-
 if [ "$1" = "configure" ]; then
         # Add user and group
         if ! getent group frankenphp >/dev/null; then

package/debian/postrm.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh
 set -e
 
 if [ -d /run/systemd/system ]; then

package/rhel/frankenphp.service

@@ -1,4 +1,4 @@
-[Unit]
+[Unit]
 Description=FrankenPHP server
 After=network.target
 

package/rhel/postinstall.sh

@@ -1,12 +1,4 @@
-#!/bin/bash
-
-if command -v setcap >/dev/null 2>&1; then
-	setcap 'cap_net_bind_service=+ep' /usr/bin/frankenphp || echo "Warning: failed to set capabilities on frankenphp"
-	echo "Users without root privileges will not be to run 'frankenphp php-server' on ports 80/443."
-else
-  echo "Warning: setcap not found. Install it with: sudo dnf install libcap"
-	echo "Users without root privileges will not be to run 'frankenphp php-server' on ports 80/443."
-fi
+#!/bin/bash
 
 if [ "$1" -eq 1 ] && [ -x "/usr/lib/systemd/systemd-update-helper" ]; then
     # Initial installation
@@ -17,7 +9,7 @@ if [ -x /usr/sbin/getsebool ]; then
     # connect to ACME endpoint to request certificates
     setsebool -P httpd_can_network_connect on
 fi
-if [ -x /usr/sbin/semanage -a -x /usr/sbin/restorecon ]; then
+if [ -x /usr/sbin/semanage ] && [ -x /usr/sbin/restorecon ]; then
     # file contexts
     semanage fcontext --add --type httpd_exec_t        '/usr/bin/frankenphp'         2> /dev/null || :
     semanage fcontext --add --type httpd_sys_content_t '/usr/share/frankenphp(/.*)?' 2> /dev/null || :

package/rhel/postuninstall.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash
 
 if [ "$1" -ge 1 ] && [ -x "/usr/lib/systemd/systemd-update-helper" ]; then
     # Package upgrade, not uninstall