From c5985c10575ae92cb6eba21c8f5b09f1f64b1f7b Mon Sep 17 00:00:00 2001
From: Richard Kuhnt <r15ch13+git@gmail.com>
Date: Thu, 30 Mar 2017 14:43:42 +0200
Subject: [PATCH] More suggested persist changes for php and nginx

---
 nginx.json   |  3 ++-
 php-nts.json | 16 ++++++++++------
 php.json     | 13 ++++++++-----
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/nginx.json b/nginx.json
index 29640e890f..7faf03818d 100644
--- a/nginx.json
+++ b/nginx.json
@@ -6,7 +6,8 @@
     "hash": "53ca945ffd3ceaa40c2c60e01218a3b7ac64e61d3907484461794ee13757cce9",
     "extract_dir": "nginx-1.11.12",
     "bin": "nginx.exe",
-    "persist": ["conf", "html", "logs"],
+    "persist": ["conf", "html", "logs", "temp"],
+    "notes": "To use the correct configuration run 'nginx -p \"$env:SCOOP\\apps\\nginx\\current\"' or 'nginx -p \"%SCOOP%\\apps\\nginx\\current\"'",
     "checkver": {
         "url": "https://nginx.org/en/CHANGES",
         "re": "Changes with nginx ([\\d.]+)"
diff --git a/php-nts.json b/php-nts.json
index 239336cf59..c50388996c 100644
--- a/php-nts.json
+++ b/php-nts.json
@@ -28,15 +28,19 @@
         "php.exe",
         "php-cgi.exe"
     ],
+    "persist": [
+        "conf",
+        [
+            "php.ini-production",
+            "conf\\php.ini"
+        ]
+    ],
     "env_set": {
-        "PHP_INI_SCAN_DIR": "$dir\\..\\conf"
+        "PHP_INI_SCAN_DIR": "$dir\\conf"
     },
     "post_install": "
-#Copy PHP configuration file to expected location
-cp \"$dir\\php.ini-production\" \"$dir\\php.ini\"
-
-#Enable extensions to be found in installation-relative folder (the default is to search C:/php)
-(gc \"$dir\\php.ini\") | % { $_ -replace '; extension_dir = \"ext\"', 'extension_dir = \"ext\"' } | sc \"$dir\\php.ini\"
+# Enable extensions to be found in installation-relative folder (the default is to search C:/php)
+(gc \"$dir\\conf\\php.ini\") | % { $_ -replace '; extension_dir = \"ext\"', 'extension_dir = \"ext\"' } | sc \"$dir\\conf\\php.ini\"
 ",
     "checkver": {
         "url": "http://windows.php.net/download/",
diff --git a/php.json b/php.json
index 272cae1c7f..4cd5984dd9 100644
--- a/php.json
+++ b/php.json
@@ -28,7 +28,13 @@
         "php.exe",
         "php-cgi.exe"
     ],
-    "persist": "conf",
+    "persist": [
+        "conf",
+        [
+            "php.ini-production",
+            "conf\\php.ini"
+        ]
+    ],
     "env_set": {
         "PHP_INI_SCAN_DIR": "$dir\\conf"
     },
@@ -39,11 +45,8 @@ if ((Test-Path \"$dir\\..\\conf\") -and !(Test-Path \"$dir\\conf\")) {
     Move-Item \"$dir\\..\\conf\" \"$dir\\conf\"
 }
 
-# Copy PHP configuration file to expected location
-cp \"$dir\\php.ini-production\" \"$dir\\php.ini\"
-
 # Enable extensions to be found in installation-relative folder (the default is to search C:/php)
-(gc \"$dir\\php.ini\") | % { $_ -replace '; extension_dir = \"ext\"', 'extension_dir = \"ext\"' } | sc \"$dir\\php.ini\"
+(gc \"$dir\\conf\\php.ini\") | % { $_ -replace '; extension_dir = \"ext\"', 'extension_dir = \"ext\"' } | sc \"$dir\\conf\\php.ini\"
 ",
     "checkver": {
         "url": "http://windows.php.net/download/",