Update to 1.63

re: https://github.com/librenms/librenms/releases/tag/1.63

1 files changed, 15 insertions, 24 deletions

diff --git a/net-mgmt/librenms/files/patch-html_install.php b/net-mgmt/librenms/files/patch-html_install.php
index 200d32b5a495..f7fc46b65d0b 100644
--- a/net-mgmt/librenms/files/patch-html_install.php
+++ b/net-mgmt/librenms/files/patch-html_install.php
@@ -1,15 +1,6 @@
---- html/install.php.orig	2019-05-12 00:03:11 UTC
+--- html/install.php.orig	2020-04-30 14:13:30 UTC
 +++ html/install.php
-@@ -362,7 +362,7 @@ $config_file = <<<"EOD"
- 
- // This is the user LibreNMS will run as
- //Please ensure this user is created and has the correct permissions to your install
--\$config['user'] = 'librenms';
-+\$config['user'] = 'www';
- 
- ### Locations - it is recommended to keep the default
- #\$config\['install_dir'\]  = "$install_dir";
-@@ -392,14 +392,14 @@
+@@ -418,14 +418,14 @@ if ($stage == 0) {
  
  # Update configuration
  #\$config\['update_channel'\] = 'release';  # uncomment to follow the monthly release channel
@@ -17,21 +8,21 @@
 +\$config\['update'\] = 0;  # uncomment to completely disable updates
  EOD;
  
- if (!file_exists("{$librenms_dir}/config.php")) {
-     $conf = fopen("config.php", 'w');
-     if ($conf != false) {
-         if (fwrite($conf, "<?php\n") === false) {
+     if (!file_exists("{$librenms_dir}/config.php")) {
+         $conf = fopen("config.php", 'w');
+         if ($conf != false) {
+             if (fwrite($conf, "<?php\n") === false) {
+-                echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /opt/librenms/)</div>");
++                echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /usr/local/www/librenms/)</div>");
+                 echo("<pre>&lt;?php\n".stripslashes($config_file)."</pre>");
+             } else {
+                 $config_file = stripslashes($config_file);
+@@ -433,7 +433,7 @@ EOD;
+                 echo("<div class='alert alert-success'>The config file has been created</div>");
+             }
+         } else {
 -            echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /opt/librenms/)</div>");
 +            echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /usr/local/www/librenms/)</div>");
              echo("<pre>&lt;?php\n".stripslashes($config_file)."</pre>");
-         } else {
-             $config_file = stripslashes($config_file);
-@@ -404,7 +404,7 @@ if (!file_exists("config.php")) {
-             echo("<div class='alert alert-success'>The config file has been created</div>");
          }
-     } else {
--        echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /opt/librenms/)</div>");
-+        echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /usr/local/www/librenms/)</div>");
-         echo("<pre>&lt;?php\n".stripslashes($config_file)."</pre>");
      }
- }