MAAS

Merge lp:~andreserl/maas/lp1482858 into lp:~maas-committers/maas/trunk

  1. lp1482858
  2. Merge into trunk
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 4191
Proposed branch: lp:~andreserl/maas/lp1482858
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 23 lines (+3/-3)
1 file modified
setup.py (+3/-3)
To merge this branch: bzr merge lp:~andreserl/maas/lp1482858
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+267973@code.launchpad.net

Commit message

Move maas-http.conf to /usr/share/maas (LP: #1482858)

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Note: depends on https://code.launchpad.net/~andreserl/maas/lp1482858_packaging/+merge/267978

Revision history for this message
Mike Pontillo (mpontillo) wrote :

Looks good! (assuming it was tested with the new packaging, of course)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2015-05-29 16:49:35 +0000
3+++ setup.py 2015-08-13 16:18:15 +0000
4@@ -64,8 +64,7 @@
5
6 data_files=[
7 ('/etc/maas',
8- ['etc/maas/drivers.yaml',
9- 'contrib/maas-http.conf']),
10+ ['etc/maas/drivers.yaml']),
11 ('/etc/maas/templates/uefi',
12 glob('etc/maas/templates/uefi/*.template')),
13 ('/etc/maas/templates/dhcp',
14@@ -84,7 +83,8 @@
15 ('/etc/maas/templates/deployment-user-data',
16 glob('etc/maas/templates/deployment-user-data/*.py')),
17 ('/usr/share/maas',
18- ['contrib/maas-rsyslog.conf']),
19+ ['contrib/maas-rsyslog.conf',
20+ 'contrib/maas-http.conf']),
21 ('/etc/maas/preseeds',
22 ['contrib/preseeds_v2/commissioning',
23 'contrib/preseeds_v2/enlist',