[DRE-commits] [diaspora-installer] 01/04: move private conf to /var
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Sat Jul 2 15:24:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository diaspora-installer.
commit 994e61710c27d6940b7640339bd4ea8b4c51dcd6
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Sat Jul 2 19:52:12 2016 +0530
move private conf to /var
---
debian/changelog | 2 ++
debian/diaspora-common.install | 4 ++--
debian/diaspora-common.postinst | 37 +++++++++++++++++++------------------
diaspora-common.conf | 6 ++++--
grantpriv.sh | 6 +++---
5 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9d11326..2899701 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
diaspora-installer (0.5.9.1+debian1) UNRELEASED; urgency=medium
* Install 0.5.9.1 version
+ * Move private copy of diaspora.conf and database.yml to /var
+ (Closes: #820073)
-- Pirate Praveen <praveen at debian.org> Thu, 30 Jun 2016 23:23:56 +0530
diff --git a/debian/diaspora-common.install b/debian/diaspora-common.install
index 1817f0f..2f12d5d 100644
--- a/debian/diaspora-common.install
+++ b/debian/diaspora-common.install
@@ -1,9 +1,9 @@
adduser.sh usr/lib/diaspora-common/scripts
-debian/database.yml /usr/share/diaspora-common/
+debian/database.yml /var/lib/diaspora-common/
diaspora-common.conf /etc/diaspora
diaspora-download.sh usr/lib/diaspora-common/scripts
diaspora-versions.sh usr/lib/diaspora-common/scripts
-diaspora.conf /usr/share/diaspora-common/
+diaspora.conf /var/lib/diaspora-common/
debian/diaspora.yml etc/diaspora
grantpriv.sh usr/lib/diaspora-common/scripts
rake-tasks.sh usr/lib/diaspora-common/scripts
diff --git a/debian/diaspora-common.postinst b/debian/diaspora-common.postinst
index 3c38557..82429af 100755
--- a/debian/diaspora-common.postinst
+++ b/debian/diaspora-common.postinst
@@ -70,9 +70,9 @@ case "$1" in
echo "SSL disabled, skip nginx configuration for ${RET}..."
if ! grep SERVERNAME ${diaspora_conf}
then
- echo export SERVERNAME=${RET} >> ${diaspora_conf}
+ echo export SERVERNAME=${RET} >> ${diaspora_conf_private}
export SERVERNAME=${RET}
- echo export ENVIRONMENT_URL="http://$SERVERNAME:3000" >> ${diaspora_conf}
+ echo export ENVIRONMENT_URL="http://$SERVERNAME:3000" >> ${diaspora_conf_private}
fi
fi
@@ -89,9 +89,9 @@ case "$1" in
facebook_app_id=$RET
db_get diaspora-common/facebook_secret
facebook_secret=$RET
- echo export SERVICES_FACEBOOK_ENABLE=true >> ${diaspora_conf}
- echo export SERVICES_FACEBOOK_APP_ID=$facebook_app_id >> ${diaspora_conf}
- echo export SERVICES_FACEBOOK_SECRET=$facebook_secret >> ${diaspora_conf}
+ echo export SERVICES_FACEBOOK_ENABLE=true >> ${diaspora_conf_private}
+ echo export SERVICES_FACEBOOK_APP_ID=$facebook_app_id >> ${diaspora_conf_private}
+ echo export SERVICES_FACEBOOK_SECRET=$facebook_secret >> ${diaspora_conf_private}
fi
servicename="Twitter"
if [ "${selectedservices#*$servicename}" != "$selectedservices" ]; then
@@ -99,9 +99,9 @@ case "$1" in
twitter_key=$RET
db_get diaspora-common/twitter_secret
twitter_secret=$RET
- echo export SERVICES_TWITTER_ENABLE=true >> ${diaspora_conf}
- echo export SERVICES_TWITTER_KEY=$twitter_key >> ${diaspora_conf}
- echo export SERVICES_TWITTER_SECRET=$twitter_secret >> ${diaspora_conf}
+ echo export SERVICES_TWITTER_ENABLE=true >> ${diaspora_conf_private}
+ echo export SERVICES_TWITTER_KEY=$twitter_key >> ${diaspora_conf_private}
+ echo export SERVICES_TWITTER_SECRET=$twitter_secret >> ${diaspora_conf_private}
fi
servicename="Tumblr"
if [ "${selectedservices#*$servicename}" != "$selectedservices" ]; then
@@ -109,9 +109,9 @@ case "$1" in
tumblr_key=$RET
db_get diaspora-common/tumblr_secret
tumblr_secret=$RET
- echo export SERVICES_TUMBLR_ENABLE=true >> ${diaspora_conf}
- echo export SERVICES_TUMBLR_KEY=$tumblr_key >> ${diaspora_conf}
- echo export SERVICES_TUMBLR_SECRET=$tumblr_secret >> ${diaspora_conf}
+ echo export SERVICES_TUMBLR_ENABLE=true >> ${diaspora_conf_private}
+ echo export SERVICES_TUMBLR_KEY=$tumblr_key >> ${diaspora_conf_private}
+ echo export SERVICES_TUMBLR_SECRET=$tumblr_secret >> ${diaspora_conf_private}
fi
servicename="Wordpress"
if [ "${selectedservices#*$servicename}" != "$selectedservices" ]; then
@@ -119,17 +119,18 @@ case "$1" in
wordpress_client_id=$RET
db_get diaspora-common/wordpress_secret
wordpress_secret=$RET
- echo export SERVICES_WORDPRESS_ENABLE=true >> ${diaspora_conf}
- echo export SERVICES_WORDPRESS_CLIENT_ID=$wordpress_client_id >> ${diaspora_conf}
- echo export SERVICES_WORDPRESS_SECRET=$wordpress_secret >> ${diaspora_conf}
+ echo export SERVICES_WORDPRESS_ENABLE=true >> ${diaspora_conf_private}
+ echo export SERVICES_WORDPRESS_CLIENT_ID=$wordpress_client_id >> ${diaspora_conf_private}
+ echo export SERVICES_WORDPRESS_SECRET=$wordpress_secret >> ${diaspora_conf_private}
fi
fi
- ucf --debconf-ok ${diaspora_conf} /etc/diaspora.conf
- ucfr diaspora-common /etc/diaspora.conf
+ echo "Registering ${diaspora_conf} via ucf"
+ ucf --debconf-ok --three-way ${diaspora_conf_private} ${diaspora_conf}
+ ucfr diaspora-common ${diaspora_conf}
${diaspora_scripts}/adduser.sh
${diaspora_scripts}/grantpriv.sh
- ucf --debconf-ok ${diaspora_database_yml} /etc/diaspora/database.yml
- ucfr diaspora-common /etc/diaspora/database.yml
+ ucf --debconf-ok --three-way ${diaspora_database_yml_private} ${diaspora_database_yml}
+ ucfr diaspora-common ${diaspora_database_yml}
mkdir -p ${diaspora_nginx_log}
mkdir -p ${diaspora_home}
chown -R ${diaspora_user}: ${diaspora_home}
diff --git a/diaspora-common.conf b/diaspora-common.conf
index 706aa84..61244c9 100644
--- a/diaspora-common.conf
+++ b/diaspora-common.conf
@@ -3,8 +3,10 @@ export diaspora_version=0.5.9.1
export diaspora_release_type=tag
export github_archive_url=https://github.com/diaspora/diaspora/archive
export diaspora_user=diaspora
-export diaspora_conf=/usr/share/diaspora-common/diaspora.conf
-export diaspora_database_yml=/usr/share/diaspora-common/database.yml
+export diaspora_conf=/etc/diaspora.conf
+export diaspora_conf_private=/var/lib/diaspora-common/diaspora.conf
+export diaspora_database_yml_private=/var/lib/diaspora-common/database.yml
+export diaspora_database_yml=/etc/diaspora/database.yml
export diaspora_home=/usr/share/diaspora
export diaspora_cache=/var/cache/diaspora-installer
export diaspora_scripts=/usr/lib/diaspora-common/scripts
diff --git a/grantpriv.sh b/grantpriv.sh
index c34a1b7..3c9dfb0 100755
--- a/grantpriv.sh
+++ b/grantpriv.sh
@@ -11,9 +11,9 @@ test -f /etc/dbconfig-common/diaspora-common.conf && . /etc/dbconfig-common/dias
if [ "$dbc_dbtype" = "mysql" ]; then
# Switch to mysql adapter, ugly hack, see #818863
sed -i 's/DB=postgres/DB=mysql/' ${diaspora_conf}
- sed -i 's/\# <<: \*mysql/<<: \*mysql/' ${diaspora_database_yml}
- sed -i 's/<<: \*postgres/\# <<: \*postgres/' ${diaspora_database_yml}
- sed -i "1,10s/password: \"\"/password: \"$dbc_dbpass\"/" ${diaspora_database_yml}
+ sed -i 's/\# <<: \*mysql/<<: \*mysql/' ${diaspora_database_yml_private}
+ sed -i 's/<<: \*postgres/\# <<: \*postgres/' ${diaspora_database_yml_private}
+ sed -i "1,10s/password: \"\"/password: \"$dbc_dbpass\"/" ${diaspora_database_yml_private}
exit 0
fi
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora-installer.git
More information about the Pkg-ruby-extras-commits
mailing list