diff options
| author | Michael Elkins <melkins@tislabs.com> | 2011-11-11 01:21:36 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2011-11-11 01:21:36 +0000 |
| commit | 342e978ef4f65bb00b45aaf120a8b9fd1f1fbde3 (patch) | |
| tree | 66bde09723876e26c408ad50461bf6ddca75d731 /rpkid | |
| parent | 77c7261f1f8173f8dcb0e30769fb553ac8bfb30c (diff) | |
if ${sysconfdir}/rpki/settings.py already exists, append a .new suffix and copy the new version
svn path=/branches/tk103/; revision=4083
Diffstat (limited to 'rpkid')
| -rw-r--r-- | rpkid/portal-gui/Makefile.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in index 24341ed4..9265e877 100644 --- a/rpkid/portal-gui/Makefile.in +++ b/rpkid/portal-gui/Makefile.in @@ -66,8 +66,11 @@ install-data: $(BUILD) install-apache mkdir -p `dirname $(DATABASE_PATH)` mkdir -p ${PYTHONPATH} # FIXME should eventually try to merge new settings? - if [ ! -f ${PYTHONPATH}/settings.py ]; then \ + @if [ ! -f ${PYTHONPATH}/settings.py ]; then \ ${INSTALL} -m 644 settings.py ${PYTHONPATH}; \ + else \ + echo "${PYTHONPATH}/settings.py already exists, installing settings.py as ${PYTHONPATH}/settings.py.new"; \ + ${INSTALL} -m 644 settings.py ${PYTHONPATH}/settings.py.new; \ fi $(DJANGO_ADMIN) syncdb --pythonpath ${PYTHONPATH} --settings settings $(DJANGO_ADMIN) collectstatic --noinput --pythonpath ${PYTHONPATH} --settings settings |