Skip to content
Permalink
Browse files

Adapt to Debian 10.

Signed-off-by: Volker Theile <votdev@gmx.de>
  • Loading branch information...
votdev committed Feb 25, 2019
1 parent 8bc9ee9 commit 9fb737da0c6d46db9210ccb7290119e8baf3f6b7

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,6 +1,6 @@
check process php-fpm with pidfile /var/run/php/php7.0-fpm.pid
start program = "/bin/systemctl start php7.0-fpm"
stop program = "/bin/systemctl stop php7.0-fpm"
check process php-fpm with pidfile /var/run/php/php7.3-fpm.pid
start program = "/bin/systemctl start php7.3-fpm"
stop program = "/bin/systemctl stop php7.3-fpm"
mode active
{%- if email_config.enable | to_bool and not notification_config.enable | to_bool %}
noalert {{ email_config.primaryemail }}
@@ -39,7 +39,7 @@ server {
location ~ \.php$ {
try_files $uri =404;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:/var/run/php-fpm-openmediavault-webgui.sock;
fastcgi_pass unix:/run/php/php7.3-fpm-openmediavault-webgui.sock;
fastcgi_index index.php;
fastcgi_read_timeout {{ fastcgi_read_timeout }};
include fastcgi.conf;
@@ -19,13 +19,13 @@

configure_phpfpm_webgui:
file.managed:
- name: "/etc/php/7.0/fpm/pool.d/openmediavault-webgui.conf"
- name: "/etc/php/7.3/fpm/pool.d/openmediavault-webgui.conf"
- contents: |
[openmediavault-webgui]
user = openmediavault-webgui
group = openmediavault-webgui

listen = /var/run/php-fpm-openmediavault-webgui.sock
listen = /run/php/php7.3-fpm-openmediavault-webgui.sock
listen.owner = www-data
listen.group = www-data
listen.mode = 0600
@@ -31,11 +31,11 @@ include:

test_phpfpm_service_config:
cmd.run:
- name: "php-fpm7.0 --test"
- name: "php-fpm7.3 --test"

restart_phpfpm_service:
service.running:
- name: php7.0-fpm
- name: php7.3-fpm
- enable: True
- require:
- cmd: test_phpfpm_service_config
@@ -1,4 +1,4 @@
#!/usr/bin/php7.0 -c/etc/openmediavault
#!/usr/bin/php7.3 -c/etc/openmediavault
<?php
/**
* This file is part of OpenMediaVault.
@@ -1,4 +1,4 @@
#!/usr/bin/php7.0 -c/etc/openmediavault
#!/usr/bin/php7.3 -c/etc/openmediavault
<?php
/**
* This file is part of OpenMediaVault.
@@ -62,7 +62,7 @@ def stage_list():


@stage.command(name='run', help='Run the specified stage.')
@click.argument('name', 'The stage name')
@click.argument('name')
@click.option(
'-q',
'--quiet',
@@ -98,7 +98,7 @@ def deploy_list():


@deploy.command(name='run', help='Run the specified state(s).')
@click.argument('names', 'The state name(s)', nargs=-1, required=True)
@click.argument('names', nargs=-1, required=True)
@click.option(
'-q',
'--quiet',
@@ -1,6 +1,12 @@
php-pam (1.0.3-1+deb10u1) stable; urgency=low

* Rebuild for Debian 10 (Buster).

-- Volker Theile <volker.theile@openmediavault.org> Tue, 26 Feb 2019 00:10:17 +0100

php-pam (1.0.3-1) stable; urgency=low

* Initial release for Debian Stretch.
* Initial release for Debian 9 (Stretch).
* Adapt and apply patch from Gentoo for PHP7 (https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f113e301d3d56ef3c9623c40014000a102db15c).

-- Volker Theile <volker.theile@openmediavault.org> Wed, 22 Feb 2017 04:40:38 -0500
@@ -1 +1 @@
usr/lib/php7
usr/lib/php7.3
@@ -27,11 +27,11 @@ PHPIZE=/usr/bin/phpize
PHPCONFIG=/usr/bin/php-config
EXT_DIR=$(shell $(PHPCONFIG) --extension-dir | sed -e "s-/--")
SOURCE_DIR=$(shell ls -d $(PECL_PKG_REALNAME)-*)
BINARYTARGETS=binary-arch-v7
BUILDTARGETS=build-v7
CLEANTARGETS=clean-v7
BINARYTARGETS=binary-arch-v7.3
BUILDTARGETS=build-v7.3
CLEANTARGETS=clean-v7.3
PHPAPIVER=$(shell /usr/bin/php-config --phpapi)
PHPCONFD=$(shell echo "/etc/php/7.0/mods-available" | sed -e "s-/--")
PHPCONFD=$(shell echo "/etc/php/7.3/mods-available" | sed -e "s-/--")

%:
dh $@ --with quilt
@@ -23,7 +23,7 @@
hostname = "omv5box"

Vagrant.configure("2") do |config|
config.vm.box = "debian/testing64"
config.vm.box = "generic/debian10"
config.vm.define hostname
config.vm.provision :shell, :path => "install.sh"
config.vm.network "private_network", ip: "192.172.16.24", auto_config: false
@@ -21,13 +21,19 @@

set -e

# Remove the default systemd-networkd configuration file.
rm -f /etc/systemd/network/99-dhcp.network

# Append user 'vagrant' to group 'ssh', otherwise the user is not allowed
# to log in via SSH.
usermod --groups ssh --append vagrant

export LANG=C.UTF-8
export DEBIAN_FRONTEND=noninteractive
export APT_LISTCHANGES_FRONTEND=none

# Install the openmediavault keyring manually.
apt-get install --yes gnupg
wget -O "/etc/apt/trusted.gpg.d/openmediavault-archive-keyring.asc" https://packages.openmediavault.org/public/archive.key
apt-key add "/etc/apt/trusted.gpg.d/openmediavault-archive-keyring.asc"

# Install openmediavault.
cat <<EOF >> /etc/apt/sources.list.d/openmediavault.list
deb http://packages.openmediavault.org/public usul main
@@ -40,19 +46,13 @@ deb http://packages.openmediavault.org/public usul main
# deb http://packages.openmediavault.org/public usul partner
# deb http://downloads.sourceforge.net/project/openmediavault/packages usul partner
EOF

export LANG=C.UTF-8
export DEBIAN_FRONTEND=noninteractive
export APT_LISTCHANGES_FRONTEND=none
wget -O "/etc/apt/trusted.gpg.d/openmediavault-archive-keyring.asc" https://packages.openmediavault.org/public/archive.key
apt-key add "/etc/apt/trusted.gpg.d/openmediavault-archive-keyring.asc"
apt-get update
apt-get --yes --auto-remove --show-upgraded \
--allow-downgrades --allow-change-held-packages \
--no-install-recommends \
--option Dpkg::Options::="--force-confdef" \
--option DPkg::Options::="--force-confold" \
install postfix openmediavault-keyring openmediavault
install openmediavault-keyring openmediavault

# Populate the database.
omv-confdbadm populate

0 comments on commit 9fb737d

Please sign in to comment.
You can’t perform that action at this time.