diff --git a/deploy/localvm.conf b/deploy/localvm.conf index 481135f2..aea6a73e 100644 --- a/deploy/localvm.conf +++ b/deploy/localvm.conf @@ -3,17 +3,17 @@ WSGISocketPrefix /opt/regluit -ServerName localhost +ServerName localvm ServerAdmin info@gluejar.com -Redirect permanent / https://127.0.0.1:443/ +Redirect permanent / https://localvm:443/ SSLEngine on -ServerName localhost:443 +ServerName localvm:443 # generated using https://mozilla.github.io/server-side-tls/ssl-config-generator/ # intermediate mode @@ -30,7 +30,7 @@ SSLCertificateFile /etc/ssl/certs/server.crt SSLCertificateKeyFile /etc/ssl/private/server.key WSGIDaemonProcess regluit-ssl processes=4 threads=4 python-eggs=/tmp/regluit-python-eggs -WSGIScriptAlias / /opt/regluit/deploy/just.wsgi +WSGIScriptAlias / /opt/regluit/deploy/localvm.wsgi Options Indexes FollowSymLinks diff --git a/deploy/localvm.wsgi b/deploy/localvm.wsgi new file mode 100644 index 00000000..f3ef54e9 --- /dev/null +++ b/deploy/localvm.wsgi @@ -0,0 +1,9 @@ +#!/usr/bin/env python + +import os + +import django.core.handlers.wsgi + +os.environ['CELERY_LOADER'] = 'django' +os.environ['DJANGO_SETTINGS_MODULE'] = 'regluit.settings.localvm' +application = django.core.handlers.wsgi.WSGIHandler() diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index 97bf89b8..b06f8718 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -106,8 +106,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.define "localvm" do |node| node.vm.box = "precise64" - node.vm.network "private_network", type: "dhcp" - #node.vm.network "private_network", ip: "192.168.33.10" + #node.vm.network "private_network", type: "dhcp" + node.vm.network "private_network", ip: "192.168.33.10" node.ssh.forward_agent = true @@ -119,6 +119,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # but this doesn't work override.vm.provision "ansible" do |ansible| ansible.playbook = 'localvm.yml' + #ansible.start_at_task = 'add setup_django.sh script to root dir' end