← Back to branch summary

~ubuntu-branches/ubuntu/raring/maas/raring-updates

« back to all changes in this revision

Viewing changes to debian/patches/01-fix-database-settings.patch

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez
  • Date: 2012-07-03 17:42:37 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20120703174237-p8l0keuuznfg721k
Tags: 0.1+bzr709+dfsg-0ubuntu1
* New Upstream release
* debian/control:
  - Depends on python-celery, python-tempita, libjs-yui3-{full,min},
    libjs-raphael
* debian/maas.install:
  - Install apiclient, celeryconfig.py, maas-import-pxe-files, preseeds_v2.
  - Update to install various files from chroot, rather tha manually copy
    them from the source.
* debian/maas.links: symlink celeryconfig.py
* debian/maas.maas-celery.upstart: Add job.
* debian/rules:
  - Install celery upstart job.
  - Do not install jslibs as packages are now used.
  - Drop copying of maas_local_settings_sample.py as source now ships
    a maas_local_settings.py
* debian/patches:
  - 04-maas-http-fix.patch: Drop. Merged upstream.
  - 01-fix-database-settings.patch: Refreshed.
  - 99_enums_js.patch: Added until creation of enum.js / build process
    is fixed.
* debian/maas.postinst: Update bzr version to correctly handle upgrades.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01-fix-database-settings.patch
1
 
Description: Use default settings for MAAS
2
 
 Use default settings for MAAS to work out of the box.
3
 
 These include setting PSERV_URL, STATIC_ROOT, and the
4
 
 configuration for the database.
5
 
Author: Andres Rodriguez <andreserl@ubuntu.com>
6
 
 
7
 
Index: maas-0.1+bzr445+dfsg.orig/contrib/maas_local_settings_sample.py
 
1
Index: maas-0.1+bzr702+dfsg.orig/contrib/maas_local_settings.py
8
2
===================================================================
9
 
--- maas-0.1+bzr445+dfsg.orig.orig/contrib/maas_local_settings_sample.py        2012-04-11 11:59:20.402953927 -0400
10
 
+++ maas-0.1+bzr445+dfsg.orig/contrib/maas_local_settings_sample.py     2012-04-11 12:14:10.379958510 -0400
 
3
--- maas-0.1+bzr702+dfsg.orig.orig/contrib/maas_local_settings.py       2012-06-29 12:03:20.000000000 -0400
 
4
+++ maas-0.1+bzr702+dfsg.orig/contrib/maas_local_settings.py    2012-06-29 12:17:00.733389757 -0400
11
5
@@ -7,7 +7,7 @@
12
6
 DEFAULT_MAAS_URL = "http://maas.internal.example.com/"
13
7
 
17
11
 
18
12
 # Prefix to use for MAAS's urls.
19
13
 # If FORCE_SCRIPT_NAME is None (the default), all the urls will start with
20
 
@@ -62,9 +62,9 @@
 
14
@@ -68,9 +68,9 @@
21
15
     'default': {
22
16
         # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' etc.
23
17
         'ENGINE': 'django.db.backends.postgresql_psycopg2',