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

Merge branch 'saas-dev' into soundcloud

Browse source
This commit is contained in:
Duncan Sommerville 2015-06-17 17:00:15 -04:00
commit 89e3eaa986
6 changed files with 84 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_apps/media-monitor/setup.py
View file

@ -22,7 +22,7 @@ else:
mm2_files.append(os.path.join(root, filename))
data_files = [
('/etc/init', ['install/upstart/airtime-media-monitor.conf.template']),
# ('/etc/init', ['install/upstart/airtime-media-monitor.conf.template']),
('/etc/init.d', ['install/sysvinit/airtime-media-monitor']),
('/etc/airtime', ['install/media_monitor_logging.cfg']),
('/var/log/airtime/media-monitor', []),

4
python_apps/pypo/setup.py
View file

@ -18,8 +18,8 @@ else:
pypo_files.append(os.path.join(root, filename))
data_files = [
('/etc/init', ['install/upstart/airtime-playout.conf.template']),
('/etc/init', ['install/upstart/airtime-liquidsoap.conf.template']),
# ('/etc/init', ['install/upstart/airtime-playout.conf.template']),
# ('/etc/init', ['install/upstart/airtime-liquidsoap.conf.template']),
('/etc/init.d', ['install/sysvinit/airtime-playout']),
('/etc/init.d', ['install/sysvinit/airtime-liquidsoap']),
('/var/log/airtime/pypo', []),