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

Merge branch '2.0.x' into devel

Browse source 
Conflicts:
	VERSION
	airtime_mvc/application/models/Systemstatus.php
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/media-monitor/install/media-monitor-initialize.py
	python_apps/pypo/install/pypo-initialize.py
	python_apps/pypo/liquidsoap_bin
	python_apps/pypo/pypopush.py
	utils/airtime-log.php
This commit is contained in:
Martin Konecny 2012-04-12 19:08:55 -04:00
commit f96b990275
23 changed files with 121 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_apps/api_clients/api_client.py
View file

@ -669,4 +669,4 @@ class AirTimeApiClient(ApiClientInterface):
logger.error('Exception: %s', e)
logger.error("traceback: %s", top)
return response

8
python_apps/create-pypo-user.py
View file

@ -11,13 +11,7 @@ def create_user(username):
if (output[0:3] != "uid"):
# Make the pypo user
print " * Creating user "+username
os.system("adduser --system --quiet --group --shell /bin/bash "+username)
#set pypo password
p = os.popen('/usr/bin/passwd pypo 1>/dev/null 2>&1', 'w')
p.write('pypo\n')
p.write('pypo\n')
p.close()
os.system("adduser --system --quiet --group "+username)
else:
print "User already exists."
#add pypo to audio group

1
python_apps/media-monitor/install/media-monitor-copy-files.py
View file

@ -50,7 +50,6 @@ try:
#copy monit files
shutil.copy('%s/../../monit/monit-airtime-generic.cfg'%current_script_dir, '/etc/monit/conf.d/')
subprocess.call('sed -i "s/\$admin_pass/%s/g" /etc/monit/conf.d/monit-airtime-generic.cfg' % get_rand_string(), shell=True)
shutil.copy('%s/../monit-airtime-media-monitor.cfg'%current_script_dir, '/etc/monit/conf.d/')
#create log dir

2
python_apps/media-monitor/install/media-monitor-uninitialize.py
View file

@ -9,7 +9,7 @@ if os.geteuid() != 0:
try:
print "Waiting for media-monitor processes to stop...",
if (os.path.exists('/etc/init.d/airtime-media-monitor')):
p = Popen("/etc/init.d/airtime-media-monitor stop", shell=True)
p = Popen("invoke-rc.d airtime-media-monitor stop", shell=True)
sts = os.waitpid(p.pid, 0)[1]
print "OK"
else:

2
python_apps/media-monitor/install/media-monitor-uninstall.py
View file

@ -29,7 +29,7 @@ try:
print 'Error loading config file: ', e
sys.exit(1)
os.system("/etc/init.d/airtime-media-monitor stop")
os.system("invoke-rc.d airtime-media-monitor stop")
os.system("rm -f /etc/init.d/airtime-media-monitor")
os.system("update-rc.d -f airtime-media-monitor remove >/dev/null 2>&1")

3
python_apps/pypo/install/pypo-copy-files.py
View file

@ -27,6 +27,9 @@ def create_dir(path):
os.makedirs(path)
except Exception, e:
pass
def get_rand_string(length=10):
return ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(length))
def get_rand_string(length=10):
return ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(length))

4
python_apps/pypo/pypopush.py
View file

@ -224,10 +224,6 @@ class PypoPush(Thread):
problem_start_time = queue_item['start']
break
iteration+=1
return (problem_at_iteration, problem_start_time)