File ampache-confpath.patch of Package ampache

Overview Repositories Revisions Requests Users Attributes Meta

File ampache-confpath.patch of Package ampache (Revision fb3e718f410ef1379b39710124f888da)

Currently displaying revision fb3e718f410ef1379b39710124f888da , Show latest

Index: ampache-4.3.0/admin/system.php
===================================================================
--- ampache-4.3.0.orig/admin/system.php
+++ ampache-4.3.0/admin/system.php
@@ -37,15 +37,15 @@ switch ($_REQUEST['action']) {
      */
     case 'generate_config':
         ob_end_clean();
-        $current = parse_ini_file(AmpConfig::get('prefix') . '/config/ampache.cfg.php');
+        $current = parse_ini_file('/etc/ampache/ampache.cfg.php');
         $final   = generate_config($current);
         $browser = new Horde_Browser();
-        $browser->downloadHeaders('ampache.cfg.php', 'text/plain', false, filesize(AmpConfig::get('prefix') . '/config/ampache.cfg.php.dist'));
+        $browser->downloadHeaders('ampache.cfg.php', 'text/plain', false, filesize('/etc/ampache/ampache.cfg.php.dist'));
         echo $final;
 
         return false;
     case 'write_config':
-        write_config(AmpConfig::get('prefix') . '/config/ampache.cfg.php');
+        write_config('/etc/ampache/ampache.cfg.php');
         header('Location: ' . AmpConfig::get('web_path') . '/index.php');
 
         return false;
Index: ampache-4.3.0/lib/debug.lib.php
===================================================================
--- ampache-4.3.0.orig/lib/debug.lib.php
+++ ampache-4.3.0/lib/debug.lib.php
@@ -343,8 +343,8 @@ function check_dependencies_folder()
 function check_config_writable()
 {
     // file eixsts && is writable, or dir is writable
-    return ((file_exists(AmpConfig::get('prefix') . '/config/ampache.cfg.php') && is_writable(AmpConfig::get('prefix') . '/config/ampache.cfg.php'))
-        || (!file_exists(AmpConfig::get('prefix') . '/config/ampache.cfg.php') && is_writeable(AmpConfig::get('prefix') . '/config/')));
+    return ((file_exists('/etc/ampache/ampache.cfg.php') && is_writable('/etc/ampache/ampache.cfg.php'))
+        || (!file_exists('/etc/ampache/ampache.cfg.php') && is_writeable('/etc/ampache/')));
 }
 
 /**
Index: ampache-4.3.0/lib/general.lib.php
===================================================================
--- ampache-4.3.0.orig/lib/general.lib.php
+++ ampache-4.3.0/lib/general.lib.php
@@ -392,7 +392,7 @@ function translate_pattern_code($code)
 function generate_config($current)
 {
     // Start building the new config file
-    $distfile = AmpConfig::get('prefix') . '/config/ampache.cfg.php.dist';
+    $distfile = '/etc/ampache/ampache.cfg.php.dist';
     $handle   = fopen($distfile, 'r');
     $dist     = fread($handle, filesize($distfile));
     fclose($handle);
Index: ampache-4.3.0/lib/init-tiny.php
===================================================================
--- ampache-4.3.0.orig/lib/init-tiny.php
+++ ampache-4.3.0/lib/init-tiny.php
@@ -32,7 +32,7 @@ if (version_compare(phpversion(), '7.1.0
 error_reporting(E_ERROR); // Only show fatal errors in production
 
 $load_time_begin = microtime(true);
-$configfile      = $a_root . '/config/ampache.cfg.php';
+$configfile      = '/etc/ampache/ampache.cfg.php';
 
 // We still allow scripts to run (it could be the purpose of the maintenance)
 if (!defined('CLI')) {
Index: ampache-4.3.0/lib/install.lib.php
===================================================================
--- ampache-4.3.0.orig/lib/install.lib.php
+++ ampache-4.3.0/lib/install.lib.php
@@ -323,7 +323,7 @@ function install_insert_db($db_user = nu
  */
 function install_create_config($download = false)
 {
-    $config_file = AmpConfig::get('prefix') . '/config/ampache.cfg.php';
+    $config_file = '/etc/ampache/ampache.cfg.php';
 
     /* Attempt to make DB connection */
     Dba::dbh();
Index: ampache-4.3.0/locale/base/gather-messages.sh
===================================================================
--- ampache-4.3.0.orig/locale/base/gather-messages.sh
+++ ampache-4.3.0/locale/base/gather-messages.sh
@@ -29,7 +29,7 @@ fi
 [[ $OLANG ]] || OLANG=$(echo $LANG | sed 's/\..*//;')
 potfile='messages.pot'
 tdstxt='translatable-database-strings.txt'
-ampconf='../../config/ampache.cfg.php'
+ampconf='/etc/ampache/ampache.cfg.php'
 
 ##############################################################
 
@@ -91,7 +91,7 @@ generate_pot_utds() {
                 $(find ../../ -type f -name \*.php -o -name \*.inc | sort)
     if [[ $? -eq 0 ]]; then
 
-        ampconf='../../config/ampache.cfg.php'
+        ampconf='/etc/ampache/ampache.cfg.php'
 
         echo -e "\033[32m Pot creation/update successful\033[0m\n"
         echo -e "Reading database login information from Amapche config file\n"
Index: ampache-4.3.0/README.md
===================================================================
--- ampache-4.3.0.orig/README.md
+++ ampache-4.3.0/README.md
@@ -76,7 +76,7 @@ Please see [the wiki](https://github.com
 
 If you are upgrading from an older version of Ampache we recommend
 moving the old directory out of the way, extracting the new copy in
-its place and then copying the old /config/ampache.cfg.php, /rest/.htaccess,
+its place and then copying the old /etc/ampache/ampache.cfg.php, /rest/.htaccess,
 /channel/.htaccess, and /play/.htaccess files if any.
 All database updates will be handled by Ampache.
 
Index: ampache-4.3.0/templates/show_install_check.inc.php
===================================================================
--- ampache-4.3.0.orig/templates/show_install_check.inc.php
+++ ampache-4.3.0/templates/show_install_check.inc.php
@@ -32,10 +32,10 @@ require $prefix . '/templates/install_he
             </p>
             <ul>
                 <li><?php echo T_('A MySQL server with a username and password that can create/modify databases'); ?></li>
-                <li><?php /* HINT: %1 and %2 refer to Ampache configuration files */ echo sprintf(T_('Your webserver has read access to the files "%1$s" and "%2%s"'), $prefix . '/sql/ampache.sql', $prefix . '/config/ampache.cfg.php.dist'); ?></li>
+                <li><?php /* HINT: %1 and %2 refer to Ampache configuration files */ echo sprintf(T_('Your webserver has read access to the files "%1$s" and "%2%s"'), $prefix . '/sql/ampache.sql', '/etc/ampache/ampache.cfg.php.dist'); ?></li>
             </ul>
             <p>
-                <?php echo sprintf(T_("Once you have ensured that the above requirements are met please fill out the information below. You will only be asked for the required config values. If you would like to make changes to your Ampache install at a later date simply edit %s"), $prefix . '/config/ampache.cfg.php'); ?>
+                <?php echo sprintf(T_("Once you have ensured that the above requirements are met please fill out the information below. You will only be asked for the required config values. If you would like to make changes to your Ampache install at a later date simply edit %s"), '/etc/ampache/ampache.cfg.php'); ?>
             </p>
         </div>
 <table class="table">
@@ -47,7 +47,7 @@ require $prefix . '/templates/install_he
     <?php require $prefix . '/templates/show_test_table.inc.php'; ?>
     <tr>
         <td><?php echo T_('"ampache.cfg.php.dist" is readable'); ?></td>
-        <td><?php echo debug_result(is_readable($prefix . '/config/ampache.cfg.php.dist')); ?></td>
+        <td><?php echo debug_result(is_readable('/etc/ampache.cfg.php.dist')); ?></td>
         <td><?php echo T_('This tests whether the configuration template can be read.'); ?></td>
     </tr>
     <tr>
Index: ampache-4.3.0/templates/show_install_config.inc.php
===================================================================
--- ampache-4.3.0.orig/templates/show_install_config.inc.php
+++ ampache-4.3.0/templates/show_install_config.inc.php
@@ -255,7 +255,7 @@ require $prefix . '/templates/install_he
 
                 <div class="col-sm-4">&nbsp;</div><div class="col-sm-8">&nbsp;</div>
                 <div class="col-sm-4">
-                    <?php echo T_('config/ampache.cfg.php action'); ?>
+                    <?php echo T_('/etc/ampache/ampache.cfg.php action'); ?>
                 </div>
                 <div class="col-sm-8">
                     <button type="submit" class="btn btn-warning" name="download"><?php echo T_('Download'); ?></button>
@@ -265,9 +265,9 @@ require $prefix . '/templates/install_he
                         <?php echo T_('Write'); ?>
                     </button>
                 </div>
-                <div class="col-sm-4 control-label"><?php echo T_('config/ampache.cfg.php exists?'); ?></div>
+                <div class="col-sm-4 control-label"><?php echo T_('/etc/ampache/ampache.cfg.php exists?'); ?></div>
                 <div class="col-sm-8"><?php echo debug_result(is_readable($configfile)); ?></div>
-                <div class="col-sm-4 control-label"><?php echo T_('config/ampache.cfg.php configured?'); ?></div>
+                <div class="col-sm-4 control-label"><?php echo T_('/etc/ampache/ampache.cfg.php configured?'); ?></div>
                 <div class="col-sm-8"><?php $results = @parse_ini_file($configfile); echo debug_result(check_config_values($results)); ?></div>
                 <div class="col-sm-4">&nbsp;</div><div class="col-sm-8">&nbsp;</div>
 
Index: ampache-4.3.0/templates/show_test_config.inc.php
===================================================================
--- ampache-4.3.0.orig/templates/show_test_config.inc.php
+++ ampache-4.3.0/templates/show_test_config.inc.php
@@ -42,7 +42,7 @@
   <div class="container" role="main">
     <div class="jumbotron" style="margin-top: 70px">
       <h1><?php echo T_('Ampache Configuration Parse Error'); ?></h1>
-      <p><?php /* HINT: ampache config file path */ echo sprintf(T_('You may have reached this page because your %s configuration file was not parsable'), '<strong>/config/ampache.cfg.php</strong>'); ?></p>
+      <p><?php /* HINT: ampache config file path */ echo sprintf(T_('You may have reached this page because your %s configuration file was not parsable'), '<strong>/etc/ampache/ampache.cfg.php</strong>'); ?></p>
       <p><a href="https://github.com/ampache/ampache/wiki/FAQ#im-getting-ampache-configuration-parse-error" rel="nofollow"><?php echo T_('Please visit the wiki for help'); ?></a></p>
     </div>
   </div>
Index: ampache-4.3.0/templates/show_test_table.inc.php
===================================================================
--- ampache-4.3.0.orig/templates/show_test_table.inc.php
+++ ampache-4.3.0/templates/show_test_table.inc.php
@@ -122,7 +122,7 @@ if (!defined('INSTALL')) { ?>
     <td><?php echo T_('Configuration file readability'); ?></td>
     <td><?php echo debug_result(is_readable($configfile), "WARNING"); ?></td>
     <td>
-        <?php echo T_('This test attempts to read config/ampache.cfg.php. If this fails the file is either not in the correct location, or not readable.'); ?> </br>
+        <?php echo T_('This test attempts to read /etc/ampache/ampache.cfg.php. If this fails the file is either not in the correct location, or not readable.'); ?> </br>
         <?php echo T_('If you are installing Ampache for the first time you can ignore this warning and proceed to the installer.'); ?> &nbsp;<a href="install.php"><?php echo T_('Web Installation'); ?></a>
     </td>
 </tr>
Index: ampache-4.3.0/test.php
===================================================================
--- ampache-4.3.0.orig/test.php
+++ ampache-4.3.0/test.php
@@ -23,7 +23,7 @@
 $prefix = dirname(__FILE__);
 require_once $prefix . '/lib/init-tiny.php';
 
-$configfile = "$prefix/config/ampache.cfg.php";
+$configfile = "/etc/ampache/ampache.cfg.php";
 switch ($_REQUEST['action']) {
     case 'config':
         // Check to see if the config file is working now, if so fall
Index: ampache-4.3.0/lib/class/registration.class.php
===================================================================
--- ampache-4.3.0.orig/lib/class/registration.class.php
+++ ampache-4.3.0/lib/class/registration.class.php
@@ -123,7 +123,7 @@ class Registration
      */
     public static function show_agreement()
     {
-        $filename = AmpConfig::get('prefix') . '/config/registration_agreement.php';
+        $filename = '/etc/ampache/registration_agreement.php';
 
         if (!file_exists($filename)) {
             return false;

Places

File ampache-confpath.patch of Package ampache (Revision fb3e718f410ef1379b39710124f888da)

Places