~andreserl/ubuntu/natty/cobbler/lp731616

« back to all changes in this revision

Viewing changes to build_backup/Makefile.rej

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum, Chuck Short, Dave Walker (Daviey), Clint Byrum
  • Date: 2011-01-25 16:46:04 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110125164604-ceox6spg2bq5t21n
Tags: 2.1.0~bzr1988-0ubuntu1
[Chuck Short]
* New upstram release.
* Re-added get-orig-source to make it easier to make a tarball.
* Dropped 02_install-layout.patch
* Added Debian/README.Source
* Reworked webroot patch
* debian/cobbler-common.install: Don't put the init script
  in /etc/cobbler. (LP: #705441)
* debian/patches/05_fix_init_paths.patch: Don't hard code init paths
  (LP: #706995)

[Dave Walker (Daviey)]
* debian/control: For binary package koan, do not depend on cobbler as it should 
  be functional separately. However, the additional dependency of libvirt-bin 
  has been added.  (LP: #707113)

[ Clint Byrum ]
* debian/patches/series: remove 02_install-layout.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
--- build_backup/Makefile
2
 
+++ build_backup/Makefile
3
 
@@ -4,6 +4,7 @@
4
 
 
5
 
 prefix=devinstall
6
 
 statepath=/tmp/cobbler_settings/$(prefix)
7
 
+www-user=www-data
8
 
 
9
 
 all: clean build
10
 
 
11
 
@@ -42,7 +43,7 @@
12
 
 
13
 
 install: build manpage
14
 
        python setup.py install -f
15
 
-       chown -R apache /usr/share/cobbler/web
16
 
+       chown -R $(www-user) /usr/share/cobbler/web
17
 
 
18
 
 debinstall: manpage
19
 
        python setup.py install -f --root $(DESTDIR)
20
 
@@ -77,7 +78,7 @@
21
 
        cp $(statepath)/dhcp.template /etc/cobbler/dhcp.template
22
 
        cp $(statepath)/rsync.template /etc/cobbler/rsync.template
23
 
        find /var/lib/cobbler/triggers | xargs chmod +x
24
 
-       chown -R apache /var/www/cobbler
25
 
+       chown -R $(www-user) /var/www/cobbler
26
 
        chmod -R +x /var/www/cobbler/web
27
 
        chmod -R +x /var/www/cobbler/svc
28
 
        rm -rf $(statepath)