Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Naomi Aro 2011-07-25 11:36:12 +02:00
commit 79f8bb8af9
10 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
install_minimal/upgrades/airtime-1.7.0/airtime-upgrade.php
View file

@ -9,14 +9,12 @@
require_once(dirname(__FILE__).'/../../include/AirtimeIni.php');
require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php');
/**
* This function creates the /etc/airtime configuration folder
* and copies the default config files to it.
*/
function CreateIniFiles()
{
global $AIRTIME_SRC;
global $AIRTIME_PYTHON_APPS;
if (!file_exists("/etc/airtime/")){
@ -26,7 +24,7 @@ function CreateIniFiles()
}
}
if (!copy($AIRTIME_SRC."/build/airtime.conf.170", CONF_FILE_AIRTIME)){
if (!copy("airtime.conf.170", CONF_FILE_AIRTIME)){
echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
exit(1);
}

22
install_minimal/upgrades/airtime-1.7.0/airtime.conf.170 Normal file
View file

@ -0,0 +1,22 @@
[database]
host = localhost
dbname = airtime
dbuser = airtime
dbpass = airtime
[rabbitmq]
host = 127.0.0.1
port = 5672
user = guest
password = guest
vhost = /
[general]
api_key = AAA
web_server_user = www-data
airtime_dir = x
base_files_dir = x
[soundcloud]
connection_retries = 3
time_between_retries = 60

3
install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
View file

@ -59,7 +59,6 @@ foreach ($configFiles as $conf) {
*/
function CreateIniFiles()
{
global $AIRTIME_SRC;
global $AIRTIME_PYTHON_APPS;
if (!file_exists("/etc/airtime/")){
@ -69,7 +68,7 @@ function CreateIniFiles()
}
}
if (!copy($AIRTIME_SRC."/build/airtime.conf.180", CONF_FILE_AIRTIME)){
if (!copy("airtime.conf.180", CONF_FILE_AIRTIME)){
echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
exit(1);
}

22
install_minimal/upgrades/airtime-1.8.0/airtime.conf.180 Normal file
View file

@ -0,0 +1,22 @@
[database]
host = localhost
dbname = airtime
dbuser = airtime
dbpass = airtime
[rabbitmq]
host = 127.0.0.1
port = 5672
user = guest
password = guest
vhost = /
[general]
api_key = AAA
web_server_user = www-data
airtime_dir = x
base_files_dir = x
[soundcloud]
connection_retries = 3
time_between_retries = 60

3
install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
View file

@ -112,7 +112,6 @@ function LoadConfig($CC_CONFIG) {
*/
function CreateIniFiles()
{
global $AIRTIME_SRC;
global $AIRTIME_PYTHON_APPS;
if (!file_exists("/etc/airtime/")){
@ -122,7 +121,7 @@ function CreateIniFiles()
}
}
if (!copy($AIRTIME_SRC."/build/airtime.conf.181", CONF_FILE_AIRTIME)){
if (!copy("airtime.conf.181", CONF_FILE_AIRTIME)){
echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
exit(1);
}

22
install_minimal/upgrades/airtime-1.8.1/airtime.conf.181 Normal file
View file

@ -0,0 +1,22 @@
[database]
host = localhost
dbname = airtime
dbuser = airtime
dbpass = airtime
[rabbitmq]
host = 127.0.0.1
port = 5672
user = guest
password = guest
vhost = /
[general]
api_key = AAA
web_server_user = www-data
airtime_dir = x
base_files_dir = x
[soundcloud]
connection_retries = 3
time_between_retries = 60

3
install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
View file

@ -112,7 +112,6 @@ function LoadConfig($CC_CONFIG) {
*/
function CreateIniFiles()
{
global $AIRTIME_SRC;
global $AIRTIME_PYTHON_APPS;
if (!file_exists("/etc/airtime/")){
@ -122,7 +121,7 @@ function CreateIniFiles()
}
}
if (!copy($AIRTIME_SRC."/build/airtime.conf.182", CONF_FILE_AIRTIME)){
if (!copy("airtime.conf.182", CONF_FILE_AIRTIME)){
echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
exit(1);
}

24
install_minimal/upgrades/airtime-1.8.2/airtime.conf.182 Normal file
View file

@ -0,0 +1,24 @@
[database]
host = localhost
dbname = airtime
dbuser = airtime
dbpass = airtime
[rabbitmq]
host = 127.0.0.1
port = 5672
user = guest
password = guest
vhost = /
[general]
api_key = AAA
web_server_user = www-data
airtime_dir = x
base_files_dir = x
base_url = localhost
base_port = 80
[soundcloud]
connection_retries = 3
time_between_retries = 60