Reverted change to demo file; changed web server config to mount the uWSGI app at the root, as it turns out it's capable of serving the demo file itself

This commit is contained in:
Richard Fine 2015-01-03 13:07:41 +00:00
parent 18118ec080
commit 6ac5e8c6d0
3 changed files with 3 additions and 2 deletions

1
Vagrantfile vendored
View File

@ -83,4 +83,5 @@ Vagrant.configure(2) do |config|
config.vm.provision "shell", inline: $bootstrap config.vm.provision "shell", inline: $bootstrap
config.vm.post_up_message = "Browse to http://isso-dev.local/demo/index.html to start."
end end

View File

@ -8,7 +8,7 @@
<div id="wrapper" style="width: 900px; text-align: left; margin-left: auto; margin-right: auto;"> <div id="wrapper" style="width: 900px; text-align: left; margin-left: auto; margin-right: auto;">
<h2><a href="index.html">Isso Demo</a></h2> <h2><a href="index.html">Isso Demo</a></h2>
<script src="isso/js/embed.min.js"></script> <script src="../js/embed.min.js"></script>
<section id="isso-thread" data-title="Isso Test"></section> <section id="isso-thread" data-title="Isso Test"></section>
</div> </div>

View File

@ -7,7 +7,7 @@
ErrorLog ${APACHE_LOG_DIR}/error.log ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined CustomLog ${APACHE_LOG_DIR}/access.log combined
ProxyPass /isso/ uwsgi://127.0.0.1:8080/ ProxyPass / uwsgi://127.0.0.1:8080/
</VirtualHost> </VirtualHost>