Merge remote-tracking branch 'origin/master' into stable

emoncms · Oct 1, 2019 · 4f52134 · 4f52134
2 parents 469341f + 6274f79
commit 4f52134
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Lib/process_old_settings.php b/Lib/process_old_settings.php
@@ -4,9 +4,9 @@
 // ------------------------------------------------------------------------------
 $settings = array(
 // Suggested installation path for symlinked emoncms modules /opt/emoncms/modules
-"emoncms_dir" => isset($emoncms_dir)?$emoncms_dir:"/opt/emoncms",
+"emoncms_dir" => isset($emoncms_dir)?$emoncms_dir:"/home/pi",
 // Suggested installation path for emonpi and EmonScripts repository:
-"openenergymonitor_dir" => isset($openenergymonitor_dir)?$openenergymonitor_dir:"/opt/openenergymonitor",
+"openenergymonitor_dir" => isset($openenergymonitor_dir)?$openenergymonitor_dir:"/home/pi",
 
 // Show all fatal PHP errors
 "display_errors" => isset($display_errors)?$display_errors:true,

diff --git a/default-settings.php b/default-settings.php
@@ -5,9 +5,9 @@
 
 $_settings = array(
 // Suggested installation path for symlinked emoncms modules /opt/emoncms
-"emoncms_dir" => "/home/pi",
+"emoncms_dir" => "/opt/emoncms",
 // Suggested installation path for emonpi and EmonScripts repository: /opt/openenergymonitor
-"openenergymonitor_dir" => "/home/pi",
+"openenergymonitor_dir" => "/opt/openenergymonitor",
 
 // Show all fatal PHP errors
 "display_errors" => true,