Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #355 from Robbt/fix/web-based-installer-config-writes 

Made rabbitmq settings write to tempfile upon check to fix install bug
This commit is contained in:
Lucas Bickel 2017-11-15 18:11:43 +01:00 committed by GitHub
parent 488b9e40c0 b89f159fe8
commit c884d536d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/build/airtime-setup/forms/rabbitmq-settings.php
View File

@ -10,7 +10,7 @@
<h3 class="form-title">RabbitMQ Settings</h3> <h3 class="form-title">RabbitMQ Settings</h3>
<span id="helpBlock" class="help-block help-message"></span> <span id="helpBlock" class="help-block help-message"></span>
<p> <p>
RabbitMQ is an AMQP-based messaging system used by Airtime. You should only edit these settings RabbitMQ is an AMQP-based messaging system used by Libretime. You should only edit these settings
if you have changed the defaults since running the installer, or if you've opted to install RabbitMQ manually. if you have changed the defaults since running the installer, or if you've opted to install RabbitMQ manually.
</p> </p>
<p> <p>

14
airtime_mvc/public/setup/database-setup.php
View File

@ -7,9 +7,9 @@
* Wrapper class for validating and installing the Airtime database during the installation process * Wrapper class for validating and installing the Airtime database during the installation process
*/ */
class DatabaseSetup extends Setup { class DatabaseSetup extends Setup {
// airtime.conf section header // airtime.conf section header
protected static $_settings = "[database]"; protected static $_section = "[database]";
// Constant form field names for passing errors back to the front-end // Constant form field names for passing errors back to the front-end
const DB_USER = "dbUser", const DB_USER = "dbUser",
@ -51,6 +51,7 @@ class DatabaseSetup extends Setup {
* @throws AirtimeDatabaseException * @throws AirtimeDatabaseException
*/ */
public function runSetup() { public function runSetup() {
$this->writeToTemp();
try { try {
$this->setNewDatabaseConnection("postgres"); $this->setNewDatabaseConnection("postgres");
if ($this->checkDatabaseExists()) { if ($this->checkDatabaseExists()) {
@ -61,14 +62,11 @@ class DatabaseSetup extends Setup {
$this->installDatabaseTables(); $this->installDatabaseTables();
} }
} catch (PDOException $e) { } catch (PDOException $e) {
throw new AirtimeDatabaseException("Couldn't establish a connection to the database! " throw new AirtimeDatabaseException("Couldn't establish a connection to the database! ".
. "Please check your credentials and try again. " "Please check your credentials and try again. "
. "PDO Exception: " . $e->getMessage(), . "PDO Exception: " . $e->getMessage(),
array(self::DB_NAME, self::DB_USER, self::DB_PASS)); array(self::DB_NAME, self::DB_USER, self::DB_PASS));
} }
$this->writeToTemp();
self::$dbh = null; self::$dbh = null;
return array( return array(
"message" => "Airtime database was created successfully!", "message" => "Airtime database was created successfully!",
@ -178,4 +176,4 @@ class DatabaseSetup extends Setup {
} }
} }
} }

2
airtime_mvc/public/setup/media-setup.php
View File

@ -104,7 +104,7 @@ class MediaSetup extends Setup {
function setupMusicDirectory() { function setupMusicDirectory() {
try { try {
$_SERVER['AIRTIME_CONF'] = AIRTIME_CONF_TEMP_PATH; $_SERVER['AIRTIME_CONF'] = AIRTIME_CONF_TEMP_PATH;
Propel::init(CONFIG_PATH . "airtime-conf-production.php"); Propel::init(AIRTIME_CONF_TEMP_PATH);
$con = Propel::getConnection(); $con = Propel::getConnection();
} catch(Exception $e) { } catch(Exception $e) {
self::$message = "Failed to insert media folder; database isn't configured properly!"; self::$message = "Failed to insert media folder; database isn't configured properly!";

2
airtime_mvc/public/setup/rabbitmq-setup.php
View File

@ -50,7 +50,6 @@ class RabbitMQSetup extends Setup {
} catch(Exception $e) { } catch(Exception $e) {
$this->identifyRMQConnectionError(); $this->identifyRMQConnectionError();
} }
return array( return array(
"message" => self::$message, "message" => self::$message,
"errors" => self::$errors "errors" => self::$errors
@ -63,6 +62,7 @@ class RabbitMQSetup extends Setup {
self::$_properties["user"], self::$_properties["user"],
self::$_properties["password"], self::$_properties["password"],
self::$_properties["vhost"]); self::$_properties["vhost"]);
$this->writeToTemp();
return isset($conn); return isset($conn);
} }

4
airtime_mvc/public/setup/setup-functions.php
View File

@ -1,6 +1,6 @@
<?php <?php
define("BUILD_PATH", dirname(dirname(__DIR__)) . "/build/"); define("BUILD_PATH", dirname(dirname(__DIR__)) . "/build/");
define("AIRTIME_CONF_TEMP_PATH", "/tmp/airtime.conf.temp"); define("AIRTIME_CONF_TEMP_PATH", "/etc/airtime/airtime.conf.temp");
define("RMQ_INI_TEMP_PATH", "/tmp/rabbitmq.ini.tmp"); define("RMQ_INI_TEMP_PATH", "/tmp/rabbitmq.ini.tmp");
// load autoloader since this files is an entry path see // load autoloader since this files is an entry path see
@ -37,7 +37,7 @@ abstract class Setup {
if (!file_exists(AIRTIME_CONF_TEMP_PATH)) { if (!file_exists(AIRTIME_CONF_TEMP_PATH)) {
copy(BUILD_PATH . "airtime.example.conf", AIRTIME_CONF_TEMP_PATH); copy(BUILD_PATH . "airtime.example.conf", AIRTIME_CONF_TEMP_PATH);
} }
//Logging::info(AIRTIME_CONF_TEMP_PATH);
$this->_write(AIRTIME_CONF_TEMP_PATH); $this->_write(AIRTIME_CONF_TEMP_PATH);
} }