BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- copy the packaged config.xml into src/conf

Browse Source 
- revert back previous change where in build.xml we copy the config.xml from client as we don't want to
   always overwrite the config.xml everytime the dev runs ant. The dev may have a custom config.xml which
   gets overwritten with what's packaged
This commit is contained in:
Richard Alam 2010-07-05 15:15:51 -04:00
parent 497a496ba7
commit a514051c3e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-client/build.xml
View File

@ -270,7 +270,7 @@
<equals arg1="${BUILD_ENV}" arg2="DEV"/>
<then>
<echo message="Copying config.xml for development environment"/>
<copy file="/var/www/bigbluebutton/client/conf/config.xml" todir="${OUTPUT_DIR}/conf" />
<copy file="${BASE_DIR}/src/conf/config.xml" todir="${OUTPUT_DIR}/conf" />
</then>
<else>
<echo message="Need to copy config.xml.template for production environment"/>

4
bigbluebutton-config/bin/bbb-conf
View File

@ -557,8 +557,8 @@ if [ $SETUPDEV ]; then
/etc/nginx/sites-available/bigbluebutton
sudo /etc/init.d/nginx restart
echo "# Copying /var/www/bigbluebutton/client/conf/config.xml to ${BBBCLIENTHOME}/bin/conf/config.xml"
cp /var/www/bigbluebutton/client/conf/config.xml $BBBCLIENTHOME/bin/conf/config.xml
echo "# Copying /var/www/bigbluebutton/client/conf/config.xml to ${BBBCLIENTHOME}/src/conf/config.xml"
cp /var/www/bigbluebutton/client/conf/config.xml $BBBCLIENTHOME/src/conf/config.xml
cd $BBBCLIENTHOME