Skip to content

Commit 3f9388e

Browse files
henderkesdunglas
andauthored
Apply suggestions from code review
commit suggested changes to preinstall/postinstall scripts Co-authored-by: Kévin Dunglas <kevin@dunglas.fr>
1 parent 9de7bb3 commit 3f9388e

5 files changed

Lines changed: 13 additions & 13 deletions

File tree

dev-alpine.Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@ RUN git clone --branch=PHP-8.4 https://github.com/php/php-src.git . && \
5555
--enable-zts \
5656
--disable-zend-signals \
5757
--enable-zend-max-execution-timers \
58-
--with-config-file-path=/etc/frankenphp/php.ini \
59-
--with-config-file-scan-dir=/etc/frankenphp/php.d \
58+
--with-config-file-path=/etc/frankenphp/php.ini \
59+
--with-config-file-scan-dir=/etc/frankenphp/php.d \
6060
--enable-debug && \
6161
make -j"$(nproc)" && \
6262
make install && \
6363
ldconfig /etc/ld.so.conf.d && \
64-
mkdir -p /etc/frankenphp/php.d && \
65-
cp php.ini-development /etc/frankenphp/php.ini && \
66-
echo "zend_extension=opcache.so" >> /etc/frankenphp/php.ini && \
67-
echo "opcache.enable=1" >> /etcfrankenphp/php.ini && \
64+
mkdir -p /etc/frankenphp/php.d && \
65+
cp php.ini-development /etc/frankenphp/php.ini && \
66+
echo "zend_extension=opcache.so" >> /etc/frankenphp/php.ini && \
67+
echo "opcache.enable=1" >> /etcfrankenphp/php.ini && \
6868
php --version
6969

7070
# Install e-dant/watcher (necessary for file watching)

dev.Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ RUN git clone --branch=PHP-8.4 https://github.com/php/php-src.git . && \
6363
make -j"$(nproc)" && \
6464
make install && \
6565
ldconfig && \
66-
mkdir -p /etc/frankenphp/php.d && \
67-
cp php.ini-development /etc/frankenphp/php.ini && \
68-
echo "zend_extension=opcache.so" >> /etc/frankenphp/php.ini && \
69-
echo "opcache.enable=1" >> /etcfrankenphp/php.ini && \
66+
mkdir -p /etc/frankenphp/php.d && \
67+
cp php.ini-development /etc/frankenphp/php.ini && \
68+
echo "zend_extension=opcache.so" >> /etc/frankenphp/php.ini && \
69+
echo "opcache.enable=1" >> /etcfrankenphp/php.ini && \
7070
php --version
7171

7272
# Install e-dant/watcher (necessary for file watching)

docs/ru/config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
FrankenPHP, Caddy, а также модули Mercure и Vulcain могут быть настроены с использованием [конфигурационных форматов, поддерживаемых Caddy](https://caddyserver.com/docs/getting-started#your-first-config).
44

5-
В [Docker-образах](docker.md) файл `Caddyfile` находится по пути `/etc/frankenphp/Caddyfile`.
5+
В [Docker-образах](docker.md) файл `Caddyfile` находится по пути `/etc/frankenphp/Caddyfile`.
66
Статический бинарный файл будет искать `Caddyfile` в директории запуска.
77

88
PHP можно настроить [с помощью файла `php.ini`](https://www.php.net/manual/en/configuration.file.php).

package/debian/postinst.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if [ "$1" = "configure" ]; then
1919
usermod -aG www-data frankenphp
2020
fi
2121

22-
# handle cases where package was installed and then purged;
22+
# Handle cases where package was installed and then purged;
2323
# user and group will still exist but with no home dir
2424
if [ ! -d /var/lib/frankenphp ]; then
2525
mkdir -p /var/lib/frankenphp

package/rhel/postinstall.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if [ "$1" -eq 1 ] && [ -x "/usr/lib/systemd/systemd-update-helper" ]; then
66
fi
77

88
if [ -x /usr/sbin/getsebool ]; then
9-
# connect to ACME endpoint to request certificates
9+
# Connect to ACME endpoint to request certificates
1010
setsebool -P httpd_can_network_connect on
1111
fi
1212
if [ -x /usr/sbin/semanage ] && [ -x /usr/sbin/restorecon ]; then

0 commit comments

Comments
 (0)