[DRE-commits] [diaspora-installer] 02/07: move yml files to /etc

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora-installer.

commit c45c28a791e87574e897ea03dc2b6befaed1400a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Aug 28 13:59:03 2015 +0530

    move yml files to /etc
---
 debian/changelog               | 4 +++-
 debian/diaspora-common.install | 4 ++--
 debian/diaspora-common.links   | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9301ae5..3e377c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 diaspora-installer (0.5.2.0+debian4) UNRELEASED; urgency=medium
 
-  * Always remove bin symlink 
+  * Always remove bin symlink
+  * Move diaspora.yml and database.yml to /etc to better handle configuration
+    changes during upgrades
 
  -- Pirate Praveen <praveen at debian.org>  Fri, 28 Aug 2015 13:18:50 +0530
 
diff --git a/debian/diaspora-common.install b/debian/diaspora-common.install
index 62c69e9..18bf6af 100644
--- a/debian/diaspora-common.install
+++ b/debian/diaspora-common.install
@@ -7,5 +7,5 @@ diaspora-versions.sh usr/lib/diaspora-common/scripts
 diaspora-download.sh usr/lib/diaspora-common/scripts
 diaspora-common.conf /etc/diaspora
 diaspora.conf /etc
-database.yml usr/share/diaspora/config
-diaspora.yml usr/share/diaspora/config
+database.yml etc/diaspora
+diaspora.yml etc/diaspora
diff --git a/debian/diaspora-common.links b/debian/diaspora-common.links
new file mode 100644
index 0000000..9fbcc69
--- /dev/null
+++ b/debian/diaspora-common.links
@@ -0,0 +1,2 @@
+etc/diaspora/diaspora.yml usr/share/diaspora/config/diaspora.yml
+etc/diaspora/database.yml usr/share/diaspora/config/database.yml

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora-installer.git