Skip to content

Commit 2127d03

Browse files
henderkeshenderkes
committed
tabs
1 parent 14d2fb4 commit 2127d03

8 files changed

Lines changed: 99 additions & 95 deletions

File tree

‎caddy/frankenphp/Caddyfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# The Caddyfile is an easy way to configure your Caddy web server.
2+
#
3+
# https://caddyserver.com/docs/caddyfile
4+
# https://frankenphp.dev/docs/config
15

26
{
37
{$CADDY_GLOBAL_OPTIONS}

‎package/Caddyfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#mercure {
3232
# # Transport to use (default to Bolt)
3333
# transport bolt {
34-
# mercure.db
35-
# }
34+
# mercure.db
35+
# }
3636
# # Publisher JWT key
3737
# publisher_jwt {env.MERCURE_PUBLISHER_JWT_KEY} {env.MERCURE_PUBLISHER_JWT_ALG}
3838
# # Subscriber JWT key

‎package/debian/postinst.sh‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,58 @@
22
set -e
33

44
if [ "$1" = "configure" ]; then
5-
# Add user and group
6-
if ! getent group frankenphp >/dev/null; then
7-
groupadd --system frankenphp
8-
fi
9-
if ! getent passwd frankenphp >/dev/null; then
10-
useradd --system \
11-
--gid frankenphp \
12-
--create-home \
13-
--home-dir /var/lib/frankenphp \
14-
--shell /usr/sbin/nologin \
15-
--comment "FrankenPHP web server" \
16-
frankenphp
17-
fi
18-
if getent group www-data >/dev/null; then
19-
usermod -aG www-data frankenphp
20-
fi
5+
# Add user and group
6+
if ! getent group frankenphp >/dev/null; then
7+
groupadd --system frankenphp
8+
fi
9+
if ! getent passwd frankenphp >/dev/null; then
10+
useradd --system \
11+
--gid frankenphp \
12+
--create-home \
13+
--home-dir /var/lib/frankenphp \
14+
--shell /usr/sbin/nologin \
15+
--comment "FrankenPHP web server" \
16+
frankenphp
17+
fi
18+
if getent group www-data >/dev/null; then
19+
usermod -aG www-data frankenphp
20+
fi
2121

22-
# handle cases where package was installed and then purged;
23-
# user and group will still exist but with no home dir
24-
if [ ! -d /var/lib/frankenphp ]; then
25-
mkdir -p /var/lib/frankenphp
26-
chown frankenphp:frankenphp /var/lib/frankenphp
27-
fi
22+
# handle cases where package was installed and then purged;
23+
# user and group will still exist but with no home dir
24+
if [ ! -d /var/lib/frankenphp ]; then
25+
mkdir -p /var/lib/frankenphp
26+
chown frankenphp:frankenphp /var/lib/frankenphp
27+
fi
2828

29-
# Add log directory with correct permissions
30-
if [ ! -d /var/log/frankenphp ]; then
31-
mkdir -p /var/log/frankenphp
32-
chown frankenphp:frankenphp /var/log/frankenphp
33-
fi
29+
# Add log directory with correct permissions
30+
if [ ! -d /var/log/frankenphp ]; then
31+
mkdir -p /var/log/frankenphp
32+
chown frankenphp:frankenphp /var/log/frankenphp
33+
fi
3434
fi
3535

3636
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
37-
# This will only remove masks created by d-s-h on package removal.
38-
deb-systemd-helper unmask frankenphp.service >/dev/null || true
37+
# This will only remove masks created by d-s-h on package removal.
38+
deb-systemd-helper unmask frankenphp.service >/dev/null || true
3939

40-
# was-enabled defaults to true, so new installations run enable.
41-
if deb-systemd-helper --quiet was-enabled frankenphp.service; then
42-
# Enables the unit on first installation, creates new
43-
# symlinks on upgrades if the unit file has changed.
44-
deb-systemd-helper enable frankenphp.service >/dev/null || true
45-
deb-systemd-invoke start frankenphp.service >/dev/null || true
46-
else
47-
# Update the statefile to add new symlinks (if any), which need to be
48-
# cleaned up on purge. Also remove old symlinks.
49-
deb-systemd-helper update-state frankenphp.service >/dev/null || true
50-
fi
40+
# was-enabled defaults to true, so new installations run enable.
41+
if deb-systemd-helper --quiet was-enabled frankenphp.service; then
42+
# Enables the unit on first installation, creates new
43+
# symlinks on upgrades if the unit file has changed.
44+
deb-systemd-helper enable frankenphp.service >/dev/null || true
45+
deb-systemd-invoke start frankenphp.service >/dev/null || true
46+
else
47+
# Update the statefile to add new symlinks (if any), which need to be
48+
# cleaned up on purge. Also remove old symlinks.
49+
deb-systemd-helper update-state frankenphp.service >/dev/null || true
50+
fi
5151

52-
# Restart only if it was already started
53-
if [ -d /run/systemd/system ]; then
54-
systemctl --system daemon-reload >/dev/null || true
55-
if [ -n "$2" ]; then
56-
deb-systemd-invoke try-restart frankenphp.service >/dev/null || true
57-
fi
58-
fi
52+
# Restart only if it was already started
53+
if [ -d /run/systemd/system ]; then
54+
systemctl --system daemon-reload >/dev/null || true
55+
if [ -n "$2" ]; then
56+
deb-systemd-invoke try-restart frankenphp.service >/dev/null || true
57+
fi
58+
fi
5959
fi

‎package/debian/postrm.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
set -e
33

44
if [ -d /run/systemd/system ]; then
5-
systemctl --system daemon-reload >/dev/null || true
5+
systemctl --system daemon-reload >/dev/null || true
66
fi
77

88
if [ "$1" = "remove" ]; then
9-
if [ -x "/usr/bin/deb-systemd-helper" ]; then
10-
deb-systemd-helper mask frankenphp.service >/dev/null || true
11-
fi
9+
if [ -x "/usr/bin/deb-systemd-helper" ]; then
10+
deb-systemd-helper mask frankenphp.service >/dev/null || true
11+
fi
1212
fi
1313

1414
if [ "$1" = "purge" ]; then
15-
if [ -x "/usr/bin/deb-systemd-helper" ]; then
16-
deb-systemd-helper purge frankenphp.service >/dev/null || true
17-
deb-systemd-helper unmask frankenphp.service >/dev/null || true
18-
fi
19-
rm -rf /var/lib/frankenphp /var/log/frankenphp /etc/frankenphp
15+
if [ -x "/usr/bin/deb-systemd-helper" ]; then
16+
deb-systemd-helper purge frankenphp.service >/dev/null || true
17+
deb-systemd-helper unmask frankenphp.service >/dev/null || true
18+
fi
19+
rm -rf /var/lib/frankenphp /var/log/frankenphp /etc/frankenphp
2020
fi

‎package/debian/prerm.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
set -e
33

44
if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
5-
deb-systemd-invoke stop frankenphp.service >/dev/null || true
6-
deb-systemd-invoke stop frankenphp-api.service >/dev/null || true
5+
deb-systemd-invoke stop frankenphp.service >/dev/null || true
6+
deb-systemd-invoke stop frankenphp-api.service >/dev/null || true
77
fi

‎package/rhel/postinstall.sh‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
#!/bin/bash
22

33
if [ "$1" -eq 1 ] && [ -x "/usr/lib/systemd/systemd-update-helper" ]; then
4-
# Initial installation
5-
/usr/lib/systemd/systemd-update-helper install-system-units frankenphp.service || :
4+
# Initial installation
5+
/usr/lib/systemd/systemd-update-helper install-system-units frankenphp.service || :
66
fi
77

88
if [ -x /usr/sbin/getsebool ]; then
9-
# connect to ACME endpoint to request certificates
10-
setsebool -P httpd_can_network_connect on
9+
# connect to ACME endpoint to request certificates
10+
setsebool -P httpd_can_network_connect on
1111
fi
1212
if [ -x /usr/sbin/semanage ] && [ -x /usr/sbin/restorecon ]; then
13-
# file contexts
14-
semanage fcontext --add --type httpd_exec_t '/usr/bin/frankenphp' 2> /dev/null || :
15-
semanage fcontext --add --type httpd_sys_content_t '/usr/share/frankenphp(/.*)?' 2> /dev/null || :
16-
semanage fcontext --add --type httpd_config_t '/etc/frankenphp(/.*)?' 2> /dev/null || :
17-
semanage fcontext --add --type httpd_var_lib_t '/var/lib/frankenphp(/.*)?' 2> /dev/null || :
18-
restorecon -r /usr/bin/frankenphp /usr/share/frankenphp /etc/frankenphp /var/lib/frankenphp || :
13+
# file contexts
14+
semanage fcontext --add --type httpd_exec_t '/usr/bin/frankenphp' 2> /dev/null || :
15+
semanage fcontext --add --type httpd_sys_content_t '/usr/share/frankenphp(/.*)?' 2> /dev/null || :
16+
semanage fcontext --add --type httpd_config_t '/etc/frankenphp(/.*)?' 2> /dev/null || :
17+
semanage fcontext --add --type httpd_var_lib_t '/var/lib/frankenphp(/.*)?' 2> /dev/null || :
18+
restorecon -r /usr/bin/frankenphp /usr/share/frankenphp /etc/frankenphp /var/lib/frankenphp || :
1919
fi
2020
if [ -x /usr/sbin/semanage ]; then
21-
# QUIC
22-
semanage port --add --type http_port_t --proto udp 80 2> /dev/null || :
23-
semanage port --add --type http_port_t --proto udp 443 2> /dev/null || :
24-
# admin endpoint
25-
semanage port --add --type http_port_t --proto tcp 2019 2> /dev/null || :
21+
# QUIC
22+
semanage port --add --type http_port_t --proto udp 80 2> /dev/null || :
23+
semanage port --add --type http_port_t --proto udp 443 2> /dev/null || :
24+
# admin endpoint
25+
semanage port --add --type http_port_t --proto tcp 2019 2> /dev/null || :
2626
fi

‎package/rhel/postuninstall.sh‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
#!/bin/bash
22

33
if [ "$1" -ge 1 ] && [ -x "/usr/lib/systemd/systemd-update-helper" ]; then
4-
# Package upgrade, not uninstall
5-
/usr/lib/systemd/systemd-update-helper mark-restart-system-units frankenphp.service || :
4+
# Package upgrade, not uninstall
5+
/usr/lib/systemd/systemd-update-helper mark-restart-system-units frankenphp.service || :
66
fi
77

88

99
if [ "$1" -eq 0 ]; then
10-
if [ -x /usr/sbin/getsebool ]; then
11-
# connect to ACME endpoint to request certificates
12-
setsebool -P httpd_can_network_connect off
13-
fi
14-
if [ -x /usr/sbin/semanage ]; then
15-
# file contexts
16-
semanage fcontext --delete --type httpd_exec_t '/usr/bin/frankenphp' 2> /dev/null || :
17-
semanage fcontext --delete --type httpd_sys_content_t '/usr/share/frankenphp(/.*)?' 2> /dev/null || :
18-
semanage fcontext --delete --type httpd_config_t '/etc/frankenphp(/.*)?' 2> /dev/null || :
19-
semanage fcontext --delete --type httpd_var_lib_t '/var/lib/frankenphp(/.*)?' 2> /dev/null || :
20-
# QUIC
21-
semanage port --delete --type http_port_t --proto udp 80 2> /dev/null || :
22-
semanage port --delete --type http_port_t --proto udp 443 2> /dev/null || :
23-
# admin endpoint
24-
semanage port --delete --type http_port_t --proto tcp 2019 2> /dev/null || :
25-
fi
10+
if [ -x /usr/sbin/getsebool ]; then
11+
# connect to ACME endpoint to request certificates
12+
setsebool -P httpd_can_network_connect off
13+
fi
14+
if [ -x /usr/sbin/semanage ]; then
15+
# file contexts
16+
semanage fcontext --delete --type httpd_exec_t '/usr/bin/frankenphp' 2> /dev/null || :
17+
semanage fcontext --delete --type httpd_sys_content_t '/usr/share/frankenphp(/.*)?' 2> /dev/null || :
18+
semanage fcontext --delete --type httpd_config_t '/etc/frankenphp(/.*)?' 2> /dev/null || :
19+
semanage fcontext --delete --type httpd_var_lib_t '/var/lib/frankenphp(/.*)?' 2> /dev/null || :
20+
# QUIC
21+
semanage port --delete --type http_port_t --proto udp 80 2> /dev/null || :
22+
semanage port --delete --type http_port_t --proto udp 443 2> /dev/null || :
23+
# admin endpoint
24+
semanage port --delete --type http_port_t --proto tcp 2019 2> /dev/null || :
25+
fi
2626
fi

‎package/rhel/preuninstall.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

33
if [ "$1" -eq 0 ] && [ -x "/usr/lib/systemd/systemd-update-helper" ]; then
4-
# Package removal, not upgrade
5-
/usr/lib/systemd/systemd-update-helper remove-system-units frankenphp.service || :
4+
# Package removal, not upgrade
5+
/usr/lib/systemd/systemd-update-helper remove-system-units frankenphp.service || :
66
fi

0 commit comments

Comments
 (0)