Commit 815dc9ec authored by Ryan Herbert's avatar Ryan Herbert

packaging+docker package web2py source code with vidjil-server

The web2py package for debian is a little out-dated and we would like to
use the latest version. As mentionned here web2py.com/init/default/download
specifying in the license where web2py's code begins and our app's ends
allows us to do this.

This commit updates the copyright file in the package to provide these
details and allow us to package our server with whichever version of
web2py we need.
parent 9b6ac274
......@@ -41,7 +41,6 @@ run apt-get update ; DEBIAN_FRONTEND=noninteractive apt-get -y -q --allow-unauth
run apt-get update ; DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --no-install-suggests -y -q --allow-unauthenticated vidjil-server
run cd /usr/share/vidjil/germline && make
run cd /usr/share/web2py && chown -R www-data:www-data .
#run ln -sf /dev/stdout /var/log/nginx/access.log \
# && ln -sf /dev/stderr /var/log/nginx/error.log
......
......@@ -10,6 +10,12 @@ exec_dir="server"
copy_files -s="$source_files" -d="$dest_files"
cd "$dest_files/server"
wget https://mdipierro.pythonanywhere.com/examples/static/web2py_src.zip
unzip web2py_src.zip
unlink web2py_src.zip
cd "$MY_PWD/$exec_dir"
create_version_file "$MY_PWD/$dest_files/server"
bash "$MY_PWD/mkdeb"
......
......@@ -12,7 +12,7 @@ Package: vidjil-server
Architecture: all
Depends: vidjil, vidjil-germline, vidjil-browser, ssh, zip, unzip, tar (>=1.2), openssh-server, python,
ipython, python-enum34, postfix, wget, python-matplotlib, python-reportlab, build-essential,
uwsgi, uwsgi-plugin-python, python-requests, python-web2py, curl, ${misc:Depends}
uwsgi, uwsgi-plugin-python, python-requests, curl, ${misc:Depends}
Recommends: apache2, nginx-full, init, systemd
Description: Vidjil visualisation server
A web2py-based webserver that utilises nginx to provide visualisation
......
......@@ -26,3 +26,7 @@ License: GPL-3.0+
.
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
.
The vidjil-server package is distributed with web2py source code which is licensed as LGPLv3.
The extent of the web2py code is found in ./server/web2py/. Any code found in
./server/web2py/applications/vidjil belongs to the Vidjil project and is licensed as such.
......@@ -285,11 +285,6 @@ case "$1" in
vidjil_logs_install
uwsgi_install
if [ ! -e "$DIR/server/web2py/web2py.py" ] ; then
cp -ans /usr/share/web2py/* "$DIR"/server/web2py/
ln -s /etc/vidjil/wsgihandler.py "$DIR"/server/web2py
fi
tools_utils="$DIR/server/web2py/applications/vidjil/modules/tools_utils.py"
if [ ! -e "$tools_utils" ] ; then
ln -s "$DIR/tools/utils.py" "$tools_utils"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment