Merge lp:~james-w/pkgme-service/nondev-config into lp:pkgme-service

[James Westby]

Hi,

Steve found that calling the files for non-dev environments "production" was confusing,
as it's also the name of one specific deployment.

This changes the files to be "nondev" and updates references.

There's also a drive-by to remove the optional and discouraged "instance_id" argument
for the oops datedir repo in the dev config.

Thanks,

James

[Jonathan Lange (jml)]

Great! Thanks!

Please add a (greppable) comment about the 'production-credentials' backwards compat thing and land.

review: Approve

[lp:~james-w/pkgme-service/nondev-config]

89. By James Westby on 2012-05-03

Add a comment as a reminder to remove the compat code. Thanks jml.

90. By James Westby on 2012-05-03

Fix the PYTHONPATH for the pkgme-devportal rename.

=== modified file 'README'
--- README	2012-01-24 23:21:32 +0000
+++ README	2012-05-03 21:16:19 +0000
@@ -6,7 +6,7 @@
 Setting up for production
 =========================
 
-First copy django_project/production_credentials.cfg.example to
-django_project/production_credentials.cfg and then edit the file to
+First copy django_project/nondev_credentials.cfg.example to
+django_project/nondev_credentials.cfg and then edit the file to
 specify appropriate values.
 
 
=== modified file 'dev_config/manifests/pkgme_service.pp'
--- dev_config/manifests/pkgme_service.pp	2012-02-27 12:28:05 +0000
+++ dev_config/manifests/pkgme_service.pp	2012-05-03 21:16:19 +0000
@@ -47,8 +47,8 @@
   require => Exec["psql-create-database-$postgres_database"],
 }
 
-file { "$::basedir/django_project/production_credentials.cfg":
-  content => template("production_credentials.cfg.erb"),
+file { "$::basedir/django_project/nondev_credentials.cfg":
+  content => template("nondev_credentials.cfg.erb"),
   owner => $unix_user,
   group => $unix_user,
   mode => 640,
@@ -99,7 +99,7 @@
   path => ["/usr/bin"],
   user => $unix_user,
   require => [
-              File["$::basedir/django_project/production_credentials.cfg"],
+              File["$::basedir/django_project/nondev_credentials.cfg"],
               File["$::basedir/pkgme.log"],
               File["$::basedir/django.log"],
              ],
@@ -119,7 +119,7 @@
 file { "$::basedir/django_project/django.wsgi":
   content => template("django.wsgi.erb"),
   require => [
-    File["$::basedir/django_project/production_credentials.cfg"],
+    File["$::basedir/django_project/nondev_credentials.cfg"],
   ]
 }
 
 
=== modified file 'dev_config/templates/celeryd.default.erb'
--- dev_config/templates/celeryd.default.erb	2012-01-18 23:45:14 +0000
+++ dev_config/templates/celeryd.default.erb	2012-05-03 21:16:19 +0000
@@ -13,4 +13,4 @@
 
 CELERYD_GROUP="pkgme"
 
-export PYTHONPATH=<%= basedir %>:<%= basedir %>/src:<%= basedir %>/sourcecode/pkgme:<%= basedir %>/sourcecode/pkgme-binary
+export PYTHONPATH=<%= basedir %>:<%= basedir %>/src:<%= basedir %>/sourcecode/pkgme:<%= basedir %>/sourcecode/pkgme-devportal
 
=== renamed file 'dev_config/templates/production_credentials.cfg.erb' => 'dev_config/templates/nondev_credentials.cfg.erb'
--- dev_config/templates/production_credentials.cfg.erb	2012-02-28 16:23:17 +0000
+++ dev_config/templates/nondev_credentials.cfg.erb	2012-05-03 21:16:19 +0000
@@ -57,5 +57,4 @@
 [oops_datedir_publisher]
 type = datedir
 error_dir = <%= basedir %>/oopses
-instance_id = production
 only_new = True
 
=== renamed file 'django_project/production.cfg' => 'django_project/nondev.cfg'
=== renamed file 'django_project/production_credentials.cfg.example' => 'django_project/nondev_credentials.cfg.example'
=== modified file 'django_project/settings.py'
--- django_project/settings.py	2012-02-28 15:31:53 +0000
+++ django_project/settings.py	2012-05-03 21:16:19 +0000
@@ -38,9 +38,12 @@
         return True
     return False
 
-# Used to choose between production and dev settings.
-if not add_if_present('production_credentials.cfg', also_add='production.cfg'):
-    add_if_present('dev.cfg')
+# Used to choose between dev and non-dev settings.
+if not add_if_present('nondev_credentials.cfg', also_add='nondev.cfg'):
+    # TODO: remove the production_credentials.cfg fallback once it is no
+    # longer in use on production. It's left here now to ease rollouts.
+    if not add_if_present('production_credentials.cfg', also_add='nondev.cfg'):
+        add_if_present('dev.cfg')
 
 # Used to override settings in tests.
 test_settings_path = os.environ.get('DJPKGME_TEST_SETTINGS_PATH', None)