Merge branch 'master' of dev.sourcefabric.org:campcaster
This commit is contained in:
commit
28f6675359
|
@ -36,7 +36,7 @@ class ApiController extends Zend_Controller_Action
|
|||
}
|
||||
|
||||
|
||||
public function mediaAction()
|
||||
public function getMediaAction()
|
||||
{
|
||||
global $CC_CONFIG;
|
||||
|
||||
|
@ -203,4 +203,4 @@ class ApiController extends Zend_Controller_Action
|
|||
}
|
||||
}
|
||||
|
||||
?>
|
||||
?>
|
||||
|
|
|
@ -1697,7 +1697,7 @@ class StoredFile {
|
|||
{
|
||||
global $CC_CONFIG;
|
||||
return "http://".$CC_CONFIG["storageUrlHost"]
|
||||
.$CC_CONFIG["apiPath"]."getMedia/file/"
|
||||
.$CC_CONFIG["apiPath"]."get-media/file/"
|
||||
.$this->gunid.".".$this->getFileExtension();
|
||||
}
|
||||
|
||||
|
@ -1784,4 +1784,4 @@ class StoredFile {
|
|||
}
|
||||
|
||||
}
|
||||
?>
|
||||
?>
|
||||
|
|
|
@ -219,6 +219,8 @@
|
|||
<column name="fade_out" phpName="DbFadeOut" type="TIME" required="false" defaultValue="00:00:00"/>
|
||||
<column name="cue_in" phpName="DbCueIn" type="TIME" required="false" defaultValue="00:00:00"/>
|
||||
<column name="cue_out" phpName="DbCueOut" type="TIME" required="false" defaultValue="00:00:00"/>
|
||||
<column name="schedule_group_played" phpName="DbScheduleGroupPlayed" type="BOOLEAN" required="false" defaultValue="0"/>
|
||||
<column name="media_item_played" phpName="DbMediaItemPlayed" type="BOOLEAN" required="false" defaultValue="0"/>
|
||||
</table>
|
||||
<table name="cc_sess" phpName="CcSess">
|
||||
<column name="sessid" phpName="Sessid" type="CHAR" size="32" primaryKey="true" required="true"/>
|
||||
|
|
|
@ -325,6 +325,8 @@ CREATE TABLE "cc_schedule"
|
|||
"fade_out" TIME default '00:00:00',
|
||||
"cue_in" TIME default '00:00:00',
|
||||
"cue_out" TIME default '00:00:00',
|
||||
"schedule_group_played" BOOLEAN default 'f',
|
||||
"media_item_played" BOOLEAN default 'f',
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ def create_user(username):
|
|||
if (output[0:3] != "uid"):
|
||||
# Make the pypo user
|
||||
print "Creating user "+username
|
||||
os.system("adduser --system --quiet --group --disabled-login "+username)
|
||||
os.system("adduser --system --quiet --group --shell /bin/bash "+username)
|
||||
else:
|
||||
print "User already exists."
|
||||
|
||||
|
|
Loading…
Reference in New Issue