Skip to content

Commit

Permalink
Configuration tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonscott committed May 15, 2014
1 parent bfc093b commit 82b177b
Show file tree
Hide file tree
Showing 3 changed files with 410 additions and 405 deletions.
5 changes: 5 additions & 0 deletions .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
</IfModule>

RewriteEngine On
Header add Access-Control-Allow-Origin "*"
Header add Access-Control-Allow-Methods "GET,PUT, POST, DELETE, OPTIONS"
Header add Access-Control-Allow-Headers "Authorization"

RewriteRule ^vpu - [L,NC]

# Redirect Trailing Slashes...
RewriteRule ^(.*)/$ /$1 [L,R=301]
Expand Down
4 changes: 1 addition & 3 deletions app/config/pubnub.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?php

return array(

'publish_key' => 'pub-c-18bc7bd1-2981-4cc4-9c4e-234d25519d36',
'subscribe_key' => 'sub-c-5782df52-d147-11e3-93dd-02ee2ddab7fe',

);
);
Loading

0 comments on commit 82b177b

Please sign in to comment.