[DRE-commits] [diaspora-installer] 22/23: make whole public writable

[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 96dd99a39a21a292db5e899df47481a568fe6701
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Jan 26 01:51:09 2017 +0530

    make whole public writable
---
 debian/diaspora-common.links    | 5 ++---
 debian/diaspora-common.postinst | 2 +-
 diaspora-download.sh            | 7 ++++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/diaspora-common.links b/debian/diaspora-common.links
index 93f3ae3..45d2e5f 100644
--- a/debian/diaspora-common.links
+++ b/debian/diaspora-common.links
@@ -1,7 +1,6 @@
 run/diaspora usr/share/diaspora/tmp
-var/lib/diaspora/uploads usr/share/diaspora/public/uploads
-var/lib/diaspora/assets/public usr/share/diaspora/public/assets
-var/lib/diaspora/assets/app usr/share/diaspora/app/assets
+var/lib/diaspora/public usr/share/diaspora/public
+var/lib/diaspora/app-assets usr/share/diaspora/app/assets
 var/lib/diaspora/.bundle usr/share/diaspora/.bundle
 var/lib/diaspora/db-schema.rb usr/share/diaspora/db/schema.rb
 var/log/diaspora usr/share/diaspora/log
diff --git a/debian/diaspora-common.postinst b/debian/diaspora-common.postinst
index feb22af..04e5396 100755
--- a/debian/diaspora-common.postinst
+++ b/debian/diaspora-common.postinst
@@ -43,7 +43,7 @@ case "$1" in
     chown ${diaspora_user}: /var/cache/diaspora
 
     # Create writable directories
-    su ${diaspora_user} -s /bin/sh -c 'mkdir -p ~/uploads ~/.bundle ~/assets/public ~/assets/app'
+    su ${diaspora_user} -s /bin/sh -c 'mkdir -p  ~/.bundle ~/public ~/app-assets'
 
     # Create private copy of diaspora.conf from example
     mkdir -p /var/lib/diaspora-common
diff --git a/diaspora-download.sh b/diaspora-download.sh
index dc320eb..7af74a3 100755
--- a/diaspora-download.sh
+++ b/diaspora-download.sh
@@ -33,10 +33,11 @@ echo "Copying files to ${diaspora_home}..."
     
 echo "diaspora archive to copy: ${diaspora_archive}"
 
-rsync -a ${diaspora_cache}/${diaspora_archive}/* ${diaspora_home} --exclude tmp --exclude log --exclude db/schema.rb --exclude app/assets
+rsync -a ${diaspora_cache}/${diaspora_archive}/* ${diaspora_home} --exclude tmp --exclude log --exclude db/schema.rb --exclude app/assets --exclude public
 cp -r  ${diaspora_cache}/${diaspora_archive}/db/schema.rb ${diaspora_user_home}/db-schema.rb.template
-cp -r  ${diaspora_cache}/${diaspora_archive}/app/assets/* ${diaspora_user_home}/assets/app
-chown -R ${diaspora_user}: ${diaspora_user_home}/assets/app
+cp -r  ${diaspora_cache}/${diaspora_archive}/app/assets/* ${diaspora_user_home}/app-assets
+cp -r  ${diaspora_cache}/${diaspora_archive}/public/* ${diaspora_user_home}/public
+chown -R ${diaspora_user}: ${diaspora_user_home}/public
 
 echo "Copying source tarball to ${diaspora_home}/public..."
 cp ${diaspora_cache}/diaspora-${diaspora_version}.tar.gz ${diaspora_home}/public/source.tar.gz

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