vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of ssh://bitbucket.org/yackob03/quay

Browse source
This commit is contained in:
yackob03 2013-12-18 19:17:08 -05:00
commit 791867dabe
5 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -20,7 +20,7 @@ pip install -r requirements.txt
running: running:
``` ```
sudo nginx -c `pwd`/nginx.conf sudo mkdir -p /mnt/nginx/ && sudo nginx -c `pwd`/nginx.conf
STACK=prod gunicorn -D --workers 4 -b unix:/tmp/gunicorn.sock --worker-class gevent -t 2000 application:application STACK=prod gunicorn -D --workers 4 -b unix:/tmp/gunicorn.sock --worker-class gevent -t 2000 application:application
``` ```

8
nginx-staging.conf
View file

@ -1,8 +1,8 @@
worker_processes 1; worker_processes 1;
user root nogroup; user root nogroup;
pid /tmp/nginx.pid; pid /mnt/nginx/nginx.pid;
error_log /tmp/nginx.error.log; error_log /mnt/nginx/nginx.error.log;
events { events {
worker_connections 1024; worker_connections 1024;
@ -14,7 +14,7 @@ http {
include /etc/nginx/mime.types; include /etc/nginx/mime.types;
default_type application/octet-stream; default_type application/octet-stream;
access_log /tmp/nginx.access.log combined; access_log /mnt/nginx/nginx.access.log combined;
sendfile on; sendfile on;
root /root/quay/; root /root/quay/;
@ -43,6 +43,7 @@ http {
server { server {
listen 443 default; listen 443 default;
client_max_body_size 8G; client_max_body_size 8G;
client_body_temp_path /mnt/nginx/client_body 1 2;
server_name _; server_name _;
keepalive_timeout 5; keepalive_timeout 5;
@ -73,6 +74,7 @@ http {
proxy_pass http://app_server; proxy_pass http://app_server;
proxy_read_timeout 2000; proxy_read_timeout 2000;
proxy_temp_path /mnt/nginx/proxy_temp 1 2;
} }
} }
} }

2
nginx.conf
View file

@ -41,6 +41,7 @@ http {
server { server {
listen 443 default; listen 443 default;
client_max_body_size 8G; client_max_body_size 8G;
client_body_temp_path /mnt/nginx/client_body 1 2;
server_name _; server_name _;
keepalive_timeout 5; keepalive_timeout 5;
@ -71,6 +72,7 @@ http {
proxy_pass http://app_server; proxy_pass http://app_server;
proxy_read_timeout 2000; proxy_read_timeout 2000;
proxy_temp_path /mnt/nginx/proxy_temp 1 2;
} }
} }
} }

16
static/js/app.js
View file

@ -89,7 +89,7 @@ function getMarkedDown(string) {
} }
// Start the application code itself. // Start the application code itself.
quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'restangular', 'angularMoment', 'angulartics', 'angulartics.google.analytics', 'angulartics.mixpanel', '$strap.directives', 'ngCookies'], function($provide, cfpLoadingBarProvider) { quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'restangular', 'angularMoment', 'angulartics', /*'angulartics.google.analytics',*/ 'angulartics.mixpanel', '$strap.directives', 'ngCookies'], function($provide, cfpLoadingBarProvider) {
cfpLoadingBarProvider.includeSpinner = false; cfpLoadingBarProvider.includeSpinner = false;
$provide.factory('CookieService', ['$cookies', '$cookieStore', function($cookies, $cookieStore) { $provide.factory('CookieService', ['$cookies', '$cookieStore', function($cookies, $cookieStore) {
@ -287,12 +287,14 @@ quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'rest
return; return;
} }
planService.isBusinessPlan(planId, function(bus) { planService.getPlan(planId, function(plan) {
if (bus) { planService.isBusinessPlan(planId, function(bus) {
document.location = '/organizations/new/?plan=' + planId; if (bus) {
} else { document.location = '/organizations/new/?plan=' + planId;
document.location = '/user?plan=' + planId; } else {
} document.location = '/user?plan=' + planId;
}
});
}); });
}); });
}; };

3
templates/base.html
View file

@ -78,6 +78,7 @@ b._i.push([a,e,d])};b.__SV=1.2}})(document,window.mixpanel||[]);
mixpanel.init(isProd ? "50ff2b2569faa3a51c8f5724922ffb7e" : "38014a0f27e7bdc3ff8cc7cc29c869f9", { track_pageview : false, debug: !isProd });</script><!-- end Mixpanel --> mixpanel.init(isProd ? "50ff2b2569faa3a51c8f5724922ffb7e" : "38014a0f27e7bdc3ff8cc7cc29c869f9", { track_pageview : false, debug: !isProd });</script><!-- end Mixpanel -->
<!-- start analytics --><script> <!-- start analytics --><script>
/*
var isProd = document.location.hostname === 'quay.io'; var isProd = document.location.hostname === 'quay.io';
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@ -86,7 +87,7 @@ var isProd = document.location.hostname === 'quay.io';
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', isProd ? 'UA-34988886-5' : 'UA-34988886-4', 'quay.io'); ga('create', isProd ? 'UA-34988886-5' : 'UA-34988886-4', 'quay.io');
*/
</script> </script>
</head> </head>
<body> <body>