Serve content from minified directory when not developing

max-mapper · May 4, 2012 · 96a4d06 · 96a4d06
1 parent f3ac0ff
commit 96a4d06
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 
 REPORTER = verbose
 
-all: scss clean minify
+all: scss minify
 
 scss:
 	compass compile
@@ -30,7 +30,7 @@ test-unit:
 		--reporter $(REPORTER) \
 		tests/unit
 
-test-selenium:
+test-selenium: scss minify
 	@NODE_ENV=testing ./node_modules/.bin/nodeunit \
 		--reporter $(REPORTER) \
 		tests/selenium

diff --git a/config/default.js b/config/default.js
@@ -1,6 +1,7 @@
 var path = require('path');
 
 module.exports = {
+    public_dir: 'public-minify',
     hosting_server: {
         port:       3000,
         domain:     'www.vcap.me:3000',  // *.vcap.me points to 127.0.0.1

diff --git a/config/development.js b/config/development.js
@@ -1,6 +1,7 @@
 var path = require('path');
 
 module.exports = {
+  public_dir: 'public',
     MongoDB: {
         popit_prefix: 'popitdev_',
     },

diff --git a/hosting-app/app.js b/hosting-app/app.js
@@ -29,7 +29,7 @@ app.configure(function(){
   app.register('.txt',  expressHogan);
   app.use(express.bodyParser());
   app.use(express.methodOverride());
-  app.use(express.static(__dirname + '/../public'));
+  app.use(express.static(__dirname + '/../' + config.public_dir));
 
   app.use( require('../lib/middleware/config')() );
   app.use(masterSelector());

diff --git a/instance-app/app.js b/instance-app/app.js
@@ -96,7 +96,7 @@ app.configure(function(){
 
   app.use(express.bodyParser());
   app.use(express.methodOverride());
-  app.use(express.static(__dirname + '/../public'));
+  app.use(express.static(__dirname + '/../' + config.public_dir));
 
   // sessions and auth
   app.use( express.cookieParser( config.instance_server.cookie_secret ) );