From e522976bcbfd1de907944cf410ccb1cb8c058994 Mon Sep 17 00:00:00 2001
From: Dominique Roux <dominique.roux4@gmail.com>
Date: Thu, 23 Nov 2017 14:56:53 +0100
Subject: [PATCH] small changes, so manifest looks nicer

---
 manifest | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/manifest b/manifest
index 344d7f8..cb74b21 100755
--- a/manifest
+++ b/manifest
@@ -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"