From 90666a4a0a3c918a31f7cdfd9fa9fd2a6ad48705 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 16 May 2008 14:42:37 -0400 Subject: The settings file is now /etc/cobbler/settings, and cobbler's command line will warn the user the old file is no longer in use and ask them to delete it before proceeding. --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3407721..d7fd78c 100644 --- a/Makefile +++ b/Makefile @@ -36,17 +36,17 @@ install: clean manpage python setup.py install -f devinstall: - cp /var/lib/cobbler/settings /tmp/cobbler_settings - cp /etc/cobbler/modules.conf /tmp/cobbler_modules.conf - cp /etc/httpd/conf.d/cobbler.conf /tmp/cobbler_http.conf - cp /etc/cobbler/users.conf /tmp/cobbler_users.conf + -cp /etc/cobbler/settings /tmp/cobbler_settings + -cp /etc/cobbler/modules.conf /tmp/cobbler_modules.conf + -cp /etc/httpd/conf.d/cobbler.conf /tmp/cobbler_http.conf + -cp /etc/cobbler/users.conf /tmp/cobbler_users.conf -cp /etc/cobbler/users.digest /tmp/cobbler_users.digest make install - cp /tmp/cobbler_settings /var/lib/cobbler/settings - cp /tmp/cobbler_modules.conf /etc/cobbler/modules.conf - cp /tmp/cobbler_users.conf /etc/cobbler/users.conf + -cp /tmp/cobbler_settings /etc/cobbler/settings + -cp /tmp/cobbler_modules.conf /etc/cobbler/modules.conf + -cp /tmp/cobbler_users.conf /etc/cobbler/users.conf -cp /tmp/cobbler_users.digest /etc/cobbler/users.digest - cp /tmp/cobbler_http.conf /etc/httpd/conf.d/cobbler.conf + -cp /tmp/cobbler_http.conf /etc/httpd/conf.d/cobbler.conf find /var/lib/cobbler/triggers | xargs chmod +x chown -R apache /var/www/cobbler chown -R apache /var/www/cgi-bin/cobbler -- cgit