Fix moving pepper to config.json

Author: zyronix

.dockerignore

@@ -18,3 +18,4 @@ data/conf.php
 src/import/*
 .gitignore
 .dockerignore
+src/inc/conf.php

src/inc/confv2.php

@@ -15,8 +15,8 @@
   }
 
   // if a pepper is set from an older version, we have to save it to the new file location
-  if (isset($PEPPER) && !file_exists($DIRECTORIES['config'] . "/pepper.json")) {
-    file_put_contents($DIRECTORIES['config'] . "/pepper.json", json_encode($PEPPER));
+  if (isset($PEPPER) && !file_exists($DIRECTORIES['config'] . "/config.json")) {
+    file_put_contents($DIRECTORIES['config'] . "/config.json", json_encode(array('PEPPER' => $PEPPER)));
   }
 } else {
   // read env variables (when running with docker-compose)
@@ -45,5 +45,6 @@
   }
 
   // load data
-  $PEPPER = json_decode(file_get_contents($DIRECTORIES['config'] . "/pepper.json"));
+  $CONFIG = json_decode(file_get_contents($DIRECTORIES['config'] . "/config.json"), true);
+  $PEPPER = $CONFIG['PEPPER'];
 }

src/inc/load.php

@@ -87,7 +87,7 @@
       Util::randomString(32),
       Util::randomString(32)
     ];
-    file_put_contents($DIRECTORIES['config'] . "/pepper.json", json_encode($PEPPER));
+    file_put_contents($DIRECTORIES['config'] . "/config.json", json_encode(array('PEPPER' =>$PEPPER)));
   }
 
   // save version and build