From: Guillaume Pellerin Date: Mon, 19 Jan 2015 01:33:57 +0000 (+0100) Subject: mv deploy confs X-Git-Tag: 0.7^2~19 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d000affc048d569a1df5b3d05b3c27df918192d6;p=timeside.git mv deploy confs --- diff --git a/Dockerfile b/Dockerfile index 0093786..14dc95a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ run gpg --keyserver pgpkeys.mit.edu --recv-key E3298399DF14BB7C run gpg -a --export E3298399DF14BB7C | apt-key add - run gpg --keyserver pgpkeys.mit.edu --recv-key 07DC563D1F41B907 run gpg -a --export 07DC563D1F41B907 | apt-key add - -add ./deploy/apt-app.list /etc/apt/sources.list.d/ +add ./examples/deploy/apt-app.list /etc/apt/sources.list.d/ run apt-get update run apt-get install -y --force-yes apt-utils run apt-get -y --force-yes -t wheezy-backports dist-upgrade @@ -38,8 +38,8 @@ add . /opt/TimeSide # setup all the configfiles run echo "daemon off;" >> /etc/nginx/nginx.conf run rm /etc/nginx/sites-enabled/default -run ln -s /opt/TimeSide/deploy/nginx-app.conf /etc/nginx/sites-enabled/ -run ln -s /opt/TimeSide/deploy/supervisor-app.conf /etc/supervisor/conf.d/ +run ln -s /opt/TimeSide/examples/deploy/nginx-app.conf /etc/nginx/sites-enabled/ +run ln -s /opt/TimeSide/examples/deploy/supervisor-app.conf /etc/supervisor/conf.d/ # install new deps from the local repo run pip install -e /opt/TimeSide diff --git a/deploy/apt-app.list b/deploy/apt-app.list deleted file mode 100644 index 647b260..0000000 --- a/deploy/apt-app.list +++ /dev/null @@ -1,10 +0,0 @@ -deb http://ftp.debian.org/debian/ wheezy-backports main contrib non-free -deb-src http://ftp.debian.org/debian/ wheezy-backports main contrib non-free - -deb http://security.debian.org/ wheezy/updates main -deb-src http://security.debian.org/ wheezy/updates main - -deb http://debian.parisson.com/debian/ wheezy main -deb-src http://debian.parisson.com/debian wheezy main - -deb ftp://ftp.igh.cnrs.fr/pub/debian-multimedia stable main \ No newline at end of file diff --git a/deploy/nginx-app.conf b/deploy/nginx-app.conf deleted file mode 100644 index 61aacc1..0000000 --- a/deploy/nginx-app.conf +++ /dev/null @@ -1,37 +0,0 @@ -# mysite_nginx.conf - -# the upstream component nginx needs to connect to -upstream django { - server unix:/opt/TimeSide/examples/sandbox/app.sock; # for a file socket - # server 127.0.0.1:8001; # for a web port socket (we'll use this first) - } - -# configuration of the server -server { - # the port your site will be served on, default_server indicates that this server block - # is the block to use if no blocks match the server_name - listen 80 default_server; - - # the domain name it will serve for - server_name .example.com; # substitute your machine's IP address or FQDN - charset utf-8; - - # max upload size - client_max_body_size 75M; # adjust to taste - - # Django media - location /media { - alias /opt/TimeSide/examples/sandbox/media; # your Django project's media files - amend as required - } - - # Django static - location /static { - alias /var/www/static; # your Django project's static files - amend as required - } - - # Finally, send all non-media requests to the Django server. - location / { - uwsgi_pass django; - include /etc/nginx/uwsgi_params; # the uwsgi_params file you installed - } - } diff --git a/deploy/supervisor-app.conf b/deploy/supervisor-app.conf deleted file mode 100644 index 86471e3..0000000 --- a/deploy/supervisor-app.conf +++ /dev/null @@ -1,6 +0,0 @@ -[program:app-uwsgi] -command = /usr/local/bin/uwsgi --ini /opt/TimeSide/examples/sandbox/uwsgi.ini - -[program:nginx-app] -command = /usr/sbin/nginx - diff --git a/examples/deploy/apt-app.list b/examples/deploy/apt-app.list new file mode 100644 index 0000000..647b260 --- /dev/null +++ b/examples/deploy/apt-app.list @@ -0,0 +1,10 @@ +deb http://ftp.debian.org/debian/ wheezy-backports main contrib non-free +deb-src http://ftp.debian.org/debian/ wheezy-backports main contrib non-free + +deb http://security.debian.org/ wheezy/updates main +deb-src http://security.debian.org/ wheezy/updates main + +deb http://debian.parisson.com/debian/ wheezy main +deb-src http://debian.parisson.com/debian wheezy main + +deb ftp://ftp.igh.cnrs.fr/pub/debian-multimedia stable main \ No newline at end of file diff --git a/examples/deploy/nginx-app.conf b/examples/deploy/nginx-app.conf new file mode 100644 index 0000000..61aacc1 --- /dev/null +++ b/examples/deploy/nginx-app.conf @@ -0,0 +1,37 @@ +# mysite_nginx.conf + +# the upstream component nginx needs to connect to +upstream django { + server unix:/opt/TimeSide/examples/sandbox/app.sock; # for a file socket + # server 127.0.0.1:8001; # for a web port socket (we'll use this first) + } + +# configuration of the server +server { + # the port your site will be served on, default_server indicates that this server block + # is the block to use if no blocks match the server_name + listen 80 default_server; + + # the domain name it will serve for + server_name .example.com; # substitute your machine's IP address or FQDN + charset utf-8; + + # max upload size + client_max_body_size 75M; # adjust to taste + + # Django media + location /media { + alias /opt/TimeSide/examples/sandbox/media; # your Django project's media files - amend as required + } + + # Django static + location /static { + alias /var/www/static; # your Django project's static files - amend as required + } + + # Finally, send all non-media requests to the Django server. + location / { + uwsgi_pass django; + include /etc/nginx/uwsgi_params; # the uwsgi_params file you installed + } + } diff --git a/examples/deploy/supervisor-app.conf b/examples/deploy/supervisor-app.conf new file mode 100644 index 0000000..86471e3 --- /dev/null +++ b/examples/deploy/supervisor-app.conf @@ -0,0 +1,6 @@ +[program:app-uwsgi] +command = /usr/local/bin/uwsgi --ini /opt/TimeSide/examples/sandbox/uwsgi.ini + +[program:nginx-app] +command = /usr/sbin/nginx +