File ampache-confpath.patch of Package ampache

Overview Repositories Revisions Requests Users Attributes Meta

File ampache-confpath.patch of Package ampache (Revision 1ce1bf9f3fb3b59c4a5502874cd31e23)

Currently displaying revision 1ce1bf9f3fb3b59c4a5502874cd31e23 , Show latest

diff -Pdpru ampache-5.0.0.orig/locale/base/gather-messages.sh ampache-5.0.0/locale/base/gather-messages.sh
--- ampache-5.0.0.orig/locale/base/gather-messages.sh	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/locale/base/gather-messages.sh	2021-09-22 17:15:16.269404452 +0200
@@ -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"
diff -Pdpru ampache-5.0.0.orig/public/templates/show_install_check.inc.php ampache-5.0.0/public/templates/show_install_check.inc.php
--- ampache-5.0.0.orig/public/templates/show_install_check.inc.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/public/templates/show_install_check.inc.php	2021-09-22 18:26:29.580459236 +0200
@@ -32,10 +32,10 @@ require __DIR__ . '/install_header.inc.p
             </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"'), __DIR__ . '/../../resources/sql/ampache.sql', __DIR__ . '/../../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"'), __DIR__ . '/../../resources/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"), __DIR__ . '/../../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 __DIR__ . '/install_header.inc.p
     <?php require __DIR__ . '/show_test_table.inc.php'; ?>
     <tr>
         <td><?php echo T_('"ampache.cfg.php.dist" is readable'); ?></td>
-        <td><?php echo debug_result(is_readable(__DIR__ . '/../../config/ampache.cfg.php.dist')); ?></td>
+        <td><?php echo debug_result(is_readable('/etc/ampache/ampache.cfg.php.dist')); ?></td>
         <td><?php echo T_('This tests whether the configuration template can be read.'); ?></td>
     </tr>
     <tr>
diff -Pdpru ampache-5.0.0.orig/public/templates/show_install_config.inc.php ampache-5.0.0/public/templates/show_install_config.inc.php
--- ampache-5.0.0.orig/public/templates/show_install_config.inc.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/public/templates/show_install_config.inc.php	2021-09-22 17:17:00.875760084 +0200
@@ -258,7 +258,7 @@ require __DIR__ . '/install_header.inc.p
 
                 <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>
@@ -268,9 +268,9 @@ require __DIR__ . '/install_header.inc.p
                         <?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>
 
diff -Pdpru ampache-5.0.0.orig/public/templates/show_test_config.inc.php ampache-5.0.0/public/templates/show_test_config.inc.php
--- ampache-5.0.0.orig/public/templates/show_test_config.inc.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/public/templates/show_test_config.inc.php	2021-09-22 17:17:15.536090218 +0200
@@ -46,7 +46,7 @@ use Ampache\Module\Util\Ui;
   <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>
diff -Pdpru ampache-5.0.0.orig/public/templates/show_test_table.inc.php ampache-5.0.0/public/templates/show_test_table.inc.php
--- ampache-5.0.0.orig/public/templates/show_test_table.inc.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/public/templates/show_test_table.inc.php	2021-09-22 17:17:26.832344595 +0200
@@ -158,7 +158,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>
diff -Pdpru ampache-5.0.0.orig/src/Config/ConfigContainer.php ampache-5.0.0/src/Config/ConfigContainer.php
--- ampache-5.0.0.orig/src/Config/ConfigContainer.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/src/Config/ConfigContainer.php	2021-09-22 17:17:39.256624371 +0200
@@ -122,6 +122,6 @@ final class ConfigContainer implements C
 
     public function getConfigFilePath(): string
     {
-        return __DIR__ . '/../../config/ampache.cfg.php';
+        return '/etc/ampache/ampache.cfg.php';
     }
 }
diff -Pdpru ampache-5.0.0.orig/src/Config/functions.php ampache-5.0.0/src/Config/functions.php
--- ampache-5.0.0.orig/src/Config/functions.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/src/Config/functions.php	2021-09-22 17:19:03.338517813 +0200
@@ -526,8 +526,8 @@ function return_bytes($val)
 function check_config_writable()
 {
     // file eixsts && is writable, or dir is writable
-    return ((file_exists(__DIR__ . '/../../config/ampache.cfg.php') && is_writable(__DIR__ . '/../../config/ampache.cfg.php'))
-        || (!file_exists(__DIR__ . '/../../config/ampache.cfg.php') && is_writeable(__DIR__ . '/../../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/')));
 }
 
 /**
diff -Pdpru ampache-5.0.0.orig/src/Config/Init/InitializationHandlerConfig.php ampache-5.0.0/src/Config/Init/InitializationHandlerConfig.php
--- ampache-5.0.0.orig/src/Config/Init/InitializationHandlerConfig.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/src/Config/Init/InitializationHandlerConfig.php	2021-09-22 17:17:55.564991618 +0200
@@ -35,7 +35,7 @@ final class InitializationHandlerConfig
     private const VERSION        = '5.0.0-release';
     private const CONFIG_VERSION = '56';
 
-    public const CONFIG_FILE_PATH = __DIR__ . '/../../../config/ampache.cfg.php';
+    public const CONFIG_FILE_PATH = '/etc/ampache/ampache.cfg.php';
 
     private EnvironmentInterface $environment;
 
diff -Pdpru ampache-5.0.0.orig/src/Module/Application/Admin/System/WriteConfigAction.php ampache-5.0.0/src/Module/Application/Admin/System/WriteConfigAction.php
--- ampache-5.0.0.orig/src/Module/Application/Admin/System/WriteConfigAction.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/src/Module/Application/Admin/System/WriteConfigAction.php	2021-09-22 17:19:23.826979195 +0200
@@ -65,7 +65,7 @@ final class WriteConfigAction implements
             throw new AccessDeniedException();
         }
 
-        $this->installationHelper->write_config(__DIR__ . '/../../../../../config/ampache.cfg.php');
+        $this->installationHelper->write_config('/etc/ampache/ampache.cfg.php');
 
         return $this->responseFactory->createResponse(StatusCode::FOUND)
             ->withHeader(
diff -Pdpru ampache-5.0.0.orig/src/Module/Application/Installation/DefaultAction.php ampache-5.0.0/src/Module/Application/Installation/DefaultAction.php
--- ampache-5.0.0.orig/src/Module/Application/Installation/DefaultAction.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/src/Module/Application/Installation/DefaultAction.php	2021-09-22 17:19:38.611312123 +0200
@@ -59,7 +59,7 @@ final class DefaultAction implements App
     {
         set_error_handler('ampache_error_handler');
 
-        $configfile = __DIR__ . '/../../../../config/ampache.cfg.php';
+        $configfile = '/etc/ampache/ampache.cfg.php';
 
         // Redirect if installation is already complete.
         if (!$this->installationHelper->install_check_status($configfile)) {
diff -Pdpru ampache-5.0.0.orig/src/Module/Application/Playback/PlayAction.php ampache-5.0.0/src/Module/Application/Playback/PlayAction.php
--- ampache-5.0.0.orig/src/Module/Application/Playback/PlayAction.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/src/Module/Application/Playback/PlayAction.php	2021-09-22 17:19:51.495602256 +0200
@@ -326,7 +326,7 @@ final class PlayAction implements Applic
         // If we are in demo mode.. die here
         if (AmpConfig::get('demo_mode')) {
             throw new AccessDeniedException(
-                'Streaming Access Denied: Disable demo_mode in \'config/ampache.cfg.php\''
+                'Streaming Access Denied: Disable demo_mode in \'/etc/ampache/ampache.cfg.php\''
             );
         }
         // Check whether streaming is allowed
diff -Pdpru ampache-5.0.0.orig/src/Module/Application/Test/ConfigAction.php ampache-5.0.0/src/Module/Application/Test/ConfigAction.php
--- ampache-5.0.0.orig/src/Module/Application/Test/ConfigAction.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/src/Module/Application/Test/ConfigAction.php	2021-09-22 17:20:05.923927154 +0200
@@ -54,7 +54,7 @@ final class ConfigAction implements Appl
     {
         // Check to see if the config file is working now, if so fall
         // through to the default, else show the appropriate template
-        $configfile = __DIR__ . '/../../../../config/ampache.cfg.php';
+        $configfile = '/etc/ampache/ampache.cfg.php';
 
         if (!count(parse_ini_file($configfile))) {
             require_once __DIR__ . '/../../../../public/templates/show_test_config.inc.php';
diff -Pdpru ampache-5.0.0.orig/src/Module/Application/Test/ShowAction.php ampache-5.0.0/src/Module/Application/Test/ShowAction.php
--- ampache-5.0.0.orig/src/Module/Application/Test/ShowAction.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/src/Module/Application/Test/ShowAction.php	2021-09-22 17:20:20.480254935 +0200
@@ -59,7 +59,7 @@ final class ShowAction implements Applic
      */
     public function run(ServerRequestInterface $request, GuiGatekeeperInterface $gatekeeper): ?ResponseInterface
     {
-        $configfile = __DIR__ . '/../../../../config/ampache.cfg.php';
+        $configfile = '/etc/ampache/ampache.cfg.php';
 
         // Load config from file
         $results = array();
diff -Pdpru ampache-5.0.0.orig/src/Module/Cli/InstallerCommand.php ampache-5.0.0/src/Module/Cli/InstallerCommand.php
--- ampache-5.0.0.orig/src/Module/Cli/InstallerCommand.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/src/Module/Cli/InstallerCommand.php	2021-09-22 17:20:33.672552010 +0200
@@ -61,7 +61,7 @@ final class InstallerCommand extends Com
     public function execute(): void
     {
         $interactor = $this->io();
-        $configfile = __DIR__ . '/../../../config/ampache.cfg.php';
+        $configfile = '/etc/ampache/ampache.cfg.php';
         $values     = $this->values();
 
         $force       = $values['force'];
diff -Pdpru ampache-5.0.0.orig/src/Module/System/InstallationHelper.php ampache-5.0.0/src/Module/System/InstallationHelper.php
--- ampache-5.0.0.orig/src/Module/System/InstallationHelper.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/src/Module/System/InstallationHelper.php	2021-09-22 17:21:02.721206155 +0200
@@ -336,7 +336,7 @@ final class InstallationHelper implement
      */
     public function install_create_config($download = false)
     {
-        $config_file = __DIR__ . '/../../../config/ampache.cfg.php';
+        $config_file = '/etc/ampache/ampache.cfg.php';
 
         /* Attempt to make DB connection */
         Dba::dbh();
@@ -652,7 +652,7 @@ final class InstallationHelper implement
     public function generate_config(array $current): string
     {
         // Start building the new config file
-        $distfile = __DIR__ . '/../../../config/ampache.cfg.php.dist';
+        $distfile = '/etc/ampache/ampache.cfg.php.dist';
         $handle   = fopen($distfile, 'r');
         $dist     = fread($handle, filesize($distfile));
         fclose($handle);
diff -Pdpru ampache-5.0.0.orig/src/Module/User/Registration.php ampache-5.0.0/src/Module/User/Registration.php
--- ampache-5.0.0.orig/src/Module/User/Registration.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/src/Module/User/Registration.php	2021-09-22 17:23:39.285079828 +0200
@@ -95,7 +95,7 @@ class Registration
      */
     public static function show_agreement()
     {
-        $filename = __DIR__ . '/../../../config/registration_agreement.php';
+        $filename = '/etc/ampache/registration_agreement.php';
 
         if (!file_exists($filename)) {
             return false;
diff -Pdpru ampache-5.0.0.orig/tests/Config/ConfigContainerTest.php ampache-5.0.0/tests/Config/ConfigContainerTest.php
--- ampache-5.0.0.orig/tests/Config/ConfigContainerTest.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/tests/Config/ConfigContainerTest.php	2021-09-22 17:22:16.810874563 +0200
@@ -245,7 +245,7 @@ class ConfigContainerTest extends Mocker
     public function testGetConfigFilePathReturnsPath(): void
     {
         $this->assertStringContainsString(
-            '/config/ampache.cfg.php',
+            '/etc/ampache/ampache.cfg.php',
             $this->createSubject([])->getConfigFilePath()
         );
     }
diff -Pdpru ampache-5.0.0.orig/tests/Module/Application/Admin/System/WriteConfigActionTest.php ampache-5.0.0/tests/Module/Application/Admin/System/WriteConfigActionTest.php
--- ampache-5.0.0.orig/tests/Module/Application/Admin/System/WriteConfigActionTest.php	2021-09-01 01:07:53.000000000 +0200
+++ ampache-5.0.0/tests/Module/Application/Admin/System/WriteConfigActionTest.php	2021-09-22 17:22:38.499433659 +0200
@@ -120,7 +120,7 @@ class WriteConfigActionTest extends Mock
         $this->installationHelper->shouldReceive('write_config')
             ->with(
                 Mockery::on(function ($path): bool {
-                    $test_path = __DIR__ . '/../../../../../config/ampache.cfg.php';
+                    $test_path = '/etc/ampache/ampache.cfg.php';
 
                     $this->assertTrue(
                         file_exists(dirname($path))

Places

File ampache-confpath.patch of Package ampache (Revision 1ce1bf9f3fb3b59c4a5502874cd31e23)

Places