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

Merge branch 'devel' into 2.3.x-saas

Browse source
This commit is contained in:
Martin Konecny 2013-01-15 15:38:27 -05:00
commit e98d6e92bb
21 changed files with 179 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_apps/api_clients/api_client.cfg
View file

@ -19,7 +19,7 @@ register_component = 'register-component/format/json/api_key/%%api_key%%/compone
# Hostname
host = 'localhost'
base_port = 80
base_dir = ''
base_dir = '/'
#############################
## Config for Media Monitor

2
python_apps/media-monitor2/configs/airtime.conf
View file

@ -17,7 +17,7 @@ web_server_user = www-data
airtime_dir = /usr/share/airtime
base_url = localhost
base_port = 80
base_dir = ''
base_dir = '/'
;How many hours ahead of time should Airtime playout engine (PYPO)
;cache scheduled media files.

2
python_apps/media-monitor2/configs/api_client.cfg
View file

@ -19,7 +19,7 @@ register_component = 'register-component/format/json/api_key/%%api_key%%/compone
# Hostname
host = 'localhost'
base_port = 80
base_dir = ''
base_dir = '/'
#############################
## Config for Media Monitor