small changes, so manifest looks nicer

This commit is contained in:
Dominique Roux 2017-11-23 14:56:53 +01:00
parent 5f9407dea5
commit e522976bcb
1 changed files with 12 additions and 5 deletions

View File

@ -48,6 +48,18 @@ domain=$(cat "$__object/parameter/domain")
# Hostname
__hostname --name "$domain"
__apt_key_uri dotdeb --uri https://www.dotdeb.org/dotdeb.gpg
require="__apt_key_uri/dotdeb" __apt_source dotdeb --uri http://packages.dotdeb.org \
--distribution jessie \
--component all
require="__apt_source/dotdeb" __apt_update_index
__apt_key_uri dotdeb --uri https://www.dotdeb.org/dotdeb.gpg
require="__apt_key_uri/dotdeb" __apt_source dotdeb --uri http://packages.dotdeb.org \
--distribution jessie \
--component all
# Install packages
for package in php7.0-common php7.0-gd php7.0-json php7.0-pgsql php7.0-curl \
php7.0-intl php7.0-mcrypt php7.0-imagick \
@ -61,12 +73,7 @@ __package curl --state=present
# Configure packages
## PHP 7
__apt_key_uri dotdeb --uri https://www.dotdeb.org/dotdeb.gpg
require="__apt_key_uri/dotdeb" __apt_source dotdeb --uri http://packages.dotdeb.org \
--distribution jessie \
--component all
require="__apt_source/dotdeb" __apt_update_index
require="__package/php7.0-fpm" __file /etc/php/7.0/fpm/pool.d/www.conf \
--owner root --group root --mode 644 --source "$__type/files/fpm.conf"