← Back to branch summary

~andreserl/maas/packaging_fix_maasdns

« back to all changes in this revision

Viewing changes to debian/patches/02-pserv-config.patch

  • Committer: Graham Binns
  • Date: 2014-03-25 17:55:21 UTC
  • mfrom: (251.1.3 packaging)
  • Revision ID: graham.binns@canonical.com-20140325175521-1vq9yo58xn8nnx1i
[r=gmb,rvb] Merged Julian's new import script branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02-pserv-config.patch
3
3
 include port, logfile, oops directory, cobbler url and username
4
4
Author: Andres Rodriguez <andreserl@ubuntu.com>
5
5
 
6
 
Index: maas-1.5+bzr1948.orig/etc/maas/pserv.yaml
7
 
===================================================================
8
 
--- maas-1.5+bzr1948.orig.orig/etc/maas/pserv.yaml      2014-02-15 12:08:35.152998981 -0500
9
 
+++ maas-1.5+bzr1948.orig/etc/maas/pserv.yaml   2014-02-15 12:08:35.148998981 -0500
 
6
--- a/etc/maas/pserv.yaml
 
7
+++ b/etc/maas/pserv.yaml
10
8
@@ -6,7 +6,7 @@
11
9
 ## running server.
12
10
 #
25
23
   # reporter:
26
24
   reporter: "maas-pserv"
27
25
 
28
 
@@ -33,10 +33,8 @@
 
26
@@ -33,8 +33,6 @@
29
27
 tftp:
30
28
   # root: /var/lib/maas/tftp
31
29
   # port: 69
34
32
   # generator: http://localhost/MAAS/api/1.0/pxeconfig/
35
33
-  generator: http://localhost:5243/api/1.0/pxeconfig/
36
34
 
37
 
 ## Boot configuration.
38
 
 boot: