mvhub-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Lee Goodrich (leegoodrich)
Related merge proposals:
  https://code.launchpad.net/~leegoodrich/mvhub/fix_apache_config/+merge/28329
  proposed by: Lee Goodrich (leegoodrich)
  review: Needs Fixing - Dan MacNeil (omacneil)
------------------------------------------------------------
revno: 421 [merge]
committer: Lee Goodrich <lgoodrich@xxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-06-24 11:24:47 -0400
message:
  merged fix_apache_config
modified:
  app-mvhub/project-tools/bin/mv_update_development
  app-mvhub/setup/etc/apache2/sites-available/mvhub.conf


--
lp:mvhub
https://code.launchpad.net/~mvhub-commit/mvhub/trunk

Your team MVHub Developers is subscribed to branch lp:mvhub.
To unsubscribe from this branch go to https://code.launchpad.net/~mvhub-commit/mvhub/trunk/+edit-subscription

=== modified file 'app-mvhub/project-tools/bin/mv_update_development'
--- app-mvhub/project-tools/bin/mv_update_development	2010-06-13 23:03:40 +0000
+++ app-mvhub/project-tools/bin/mv_update_development	2010-06-23 16:59:44 +0000
@@ -107,6 +107,11 @@
                 MVHub::Utils::Setup::add_apache_config( $USERNAME, $prefix );
             }
         }
+        $prompt = "Update contents of /etc? (Y/N):";
+        if ( !($interactive) || IO::Prompt::prompt( $prompt, -YN ) ) {
+    	    MVHub::Utils::Setup::update_etc_files( $cfg );
+            MVHub::Utils::Setup::restart_services();
+	    }
     }
 }
 

=== modified file 'app-mvhub/setup/etc/apache2/sites-available/mvhub.conf'
--- app-mvhub/setup/etc/apache2/sites-available/mvhub.conf	2010-02-03 19:36:09 +0000
+++ app-mvhub/setup/etc/apache2/sites-available/mvhub.conf	2010-06-23 16:59:44 +0000
@@ -28,7 +28,7 @@
 
        ErrorLog  /var/www/mvhub/$USER/log/$SITE/error.log
        CustomLog /var/www/mvhub/$USER/log/$SITE/referer.log referer
-       CustomLog /var/www/mvhub/$USER/log/$SITE/combined.log combined env=DO_LOG
+       CustomLog /var/www/mvhub/$USER/log/$SITE/combined.log combined 
        
        ScriptAlias /cgi-bin/ /var/www/mvhub/$USER/link-to-live-code/app-mvhub/DocumentRoot/cgi-bin/ 
        <Directory  /var/www/mvhub/$USER/link-to-live-code/app-mvhub/cgi-bin/>
@@ -94,8 +94,7 @@
 </Macro>
 
 # Edit / Add 
-Include /etc/apache2/sites-available/mvhub_developer.data
-Include /etc/apache2/sites-available/mvhub_production.data
+Include /etc/apache2/sites-available/mvhub.data
 
 # USER:
 #	-- username the webserver runs as
@@ -113,7 +112,7 @@
 # **** OBVIOUSLY, changes also have to be made to DNS
 
 # for testing on laptop
-#             USER        	SITE	DOMAIN
+#	              USER        	SITE	DOMAIN
 
 	# Use MVHub   omacneil    	mvh	mvh.localhost
 # or:
@@ -125,19 +124,17 @@
 #             USER        	SITE	DOMAIN
 # Use MVHub   omacneil    	mvh	mvh.omacneil.testing123.net
 # use MVHub   omacneil    	nsp	nsp.omacneil.testing123.net
-# use MVHub   03_smoke_test  	mvh	mvh.smoke-test.testing123.net
-# use MVHub   03_smoke_test  	nsp	nsp.smoke-test.testing123.net
 
 # Staging
 #             USER        	SITE	DOMAIN
-# use MVHub   02_staging	mvh	staging.mvhub.com
-# use MVHub   02_staging	nsp	staging.northshoreport.org
+# use MVHub   www-data		mvh	mvh.staging.testing123.net
+# use MVHub   www-data		nsp	nsp.staging.testing123.net
 
 # Production
 #             USER        	SITE	DOMAIN
-# use MVHub   01_production	mvh	mvhub.com
-# use MVHub   01_production	mvh	mvhub.org
-# use MVHub   01_production	mvh	mvhub.net
-# use MVHub   01_production	nsp	northshoreport.org
-# use MVHub   01_production	nsp	northshoreport.com
-# use MVHub   01_production	nsp	northshoreport.net
+# use MVHub   www-data		mvh	mvhub.com
+# use MVHub   www-data		mvh	mvhub.org
+# use MVHub   www-data		mvh	mvhub.net
+# use MVHub   www-data		nsp	northshoreport.org
+# use MVHub   www-data		nsp	northshoreport.com
+# use MVHub   www-data		nsp	northshoreport.net