summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules3
-rw-r--r--examples/bcfg2.conf4
3 files changed, 5 insertions, 4 deletions
diff --git a/debian/control b/debian/control
index 48e915384..2e4a1f0f6 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Description: build configuration system
Package: bcfg2-server
Architecture: all
-Depends: ${python:Depends}, bcfg2, python-lxml (>= 0.8), python2.3-fam | python2.3-gamin, m2crypto
+Depends: ${python:Depends}, bcfg2, python-lxml (>= 0.8), python-fam | python2.3-gamin, m2crypto
Description: build configuration system, version two
Bcfg2 is a symbolic configuration management system,
produced at Argonne National Lab.
diff --git a/debian/rules b/debian/rules
index fd44787ea..9ba490a2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ install: build
dh_installdirs
python setup.py install --prefix=$(PWD)/debian/bcfg2-install/usr
mkdir -p ./debian/bcfg2/etc
- cp -f examples/bcfg2.conf ./debian/bcfg2/etc/bcfg2.conf
+ install -g 0 -o 0 -m 600 examples/bcfg2.conf ./debian/bcfg2/etc/bcfg2.conf
# Build architecture-dependent files here.
# We have nothing to do by default.
@@ -63,6 +63,7 @@ binary-indep: build install
dh_strip
dh_compress
dh_fixperms
+ chmod 600 debian/bcfg2/etc/bcfg2.conf
# dh_perl
dh_python
# dh_makeshlibs
diff --git a/examples/bcfg2.conf b/examples/bcfg2.conf
index a308f7cd7..db3bb8a3f 100644
--- a/examples/bcfg2.conf
+++ b/examples/bcfg2.conf
@@ -1,5 +1,5 @@
[server]
-repository = /disks/bcfg2
+repository = /var/lib/bcfg2
structures = Bundler,Base
generators = SSHbase,Cfg,Pkgmgr,Svcmgr
@@ -9,7 +9,7 @@ sendmailpath = /usr/sbin/sendmail
[communication]
protocol = xmlrpc/ssl
password = foobat
-key = /etc/cobalt.key
+key = /etc/bcfg2.key
[components]
bcfg2 = https://localhost:6789