more vagrant cleanup - mindtouch and phpbb

squash
mdn · Jan 9, 2013 · 52f8c0e · 52f8c0e
1 parent 35a1958
commit 52f8c0e
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 2,539 deletions.
diff --git a/docs/installation-vagrant.rst b/docs/installation-vagrant.rst
@@ -118,10 +118,6 @@ What’s next?
 
           sudo puppet apply /vagrant/puppet/manifests/dev-vagrant.pp
 
--  The VM comes with MindTouch wiki (the one that powers the production
-   developer.mozilla.org site) installed. Visit http://developer-dev.mozilla.org/en/Test
-   after you log in to create a page in it.
-
 -  **Experimental and Optional**: Download and import data extracted and
    sanitized from the production site. This can take a long while, since
    there’s over 500MB of data to download. ::

diff --git a/puppet/files/tmp/mindtouch-core.xml b/puppet/files/tmp/mindtouch-core.xml
diff --git a/puppet/files/tmp/phpbb.sql b/puppet/files/tmp/phpbb.sql
diff --git a/puppet/files/vagrant/settings_local.py b/puppet/files/vagrant/settings_local.py
@@ -16,10 +16,6 @@
 PROD_DETAILS_DIR = '/home/vagrant/product_details_json'
 MDC_PAGES_DIR    = '/home/vagrant/mdc_pages'
 
-DEKIWIKI_ENDPOINT = False # "http://localhost"
-DEKIWIKI_APIKEY = "GFxaNVK37fLPsFEYM7NwdIuNpGIiFTOX"
-DEKIWIKI_MOCK = True
-
 GOOGLE_MAPS_API_KEY = "ABQIAAAANRj9BHQi5ireVluCwVy0yRSrufPN8BjQWjkoRva24PCQEXS2OhSXu2BEgUH5PmGOmW71r2-tEuOVuQ"
 
 RECAPTCHA_USE_SSL = False

diff --git a/puppet/files/var/www/dekiwiki/LocalSettings.php b/puppet/files/var/www/dekiwiki/LocalSettings.php
diff --git a/puppet/files/var/www/dekiwiki/favicon.ico b/puppet/files/var/www/dekiwiki/favicon.ico
diff --git a/puppet/files/var/www/phpbb/config.php b/puppet/files/var/www/phpbb/config.php
diff --git a/settings.py b/settings.py
@@ -1042,8 +1042,8 @@ def read_only_mode(env):
     ),
 
     GOOGLE_ANALYTICS_ACCOUNT = (
-        '',
-        'Google Analytics Tracking Account Number',
+        '0',
+        'Google Analytics Tracking Account Number (0 to disable)',
     ),
 )