On ശനി 25 മാര്ച്ച് 2017 10:46 വൈകു, Ivo De Decker wrote: > Hi, > > On Fri, Mar 24, 2017 at 10:52:44AM +0530, Pirate Praveen wrote: >> I don't understand why diaspora-installer was removed from testing. #858521 was >> only affecting unstable. > > There are serious doubts whether this package is suitable for a stable > release. The version that was in testing clearly wasn't (#856720 was the > trigger for the original request in this unblock bug). This was because it was failing only in systems without systemd and hence I was not seeing the failure locally. I finally fixed it when someone found the bug in docker (no systemd in docker). Now when thinking about it, I wonder if failure in systems without systemd can be considered RC. /run/diaspora directory was getting created by debian/tmpfiles.d/diaspora.conf by systemd. > Previous attempts to > fix the issues weren't successful, and a review of the latest changes, > combined with the filing of #858521 (which was found by piuparts testing), > raises serious concerns about the quality of the package. For it to be allowed > back into testing, a thorough review of the entire packaging would be needed, > and I don't know it that's realistic for stretch. gitlab package got a thorough review from Niels and all the comments were incorporated into diaspora-common as well. There were also some comments on -devel which were also incorporated (like checking integrity of downloaded tarballs). I request the release team to reconsider. > Cheers, > > Ivo > >
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/changelog diaspora-installer-0.6.5.0+debian1/debian/changelog
--- diaspora-installer-0.6.3.0+debian1/debian/changelog 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/changelog 2017-04-28 15:01:29.000000000 +0530
@@ -1,3 +1,43 @@
+diaspora-installer (0.6.5.0+debian1) unstable; urgency=medium
+
+ * Install 0.6.5.0 version of diaspora
+ * Create /run/diaspora for systems without systemd (Closes: #856720)
+ * Read values from config file and seed debconf db
+ * Configure nginx even when https disabled (in earlier versions, diaspora
+ was accessible via port 3000, but now it is only available via unix socket)
+ * Make postrm idempotent (don't fail if variable is not set)
+ * Update values in config if changed via debconf
+ * Ask letsencrypt update email
+ * Change libssl-dev to libssl1.0-dev
+ * Check sha256 sum of downloaded tarball
+
+ -- Pirate Praveen <praveen@debian.org> Fri, 28 Apr 2017 15:01:29 +0530
+
+diaspora-installer (0.6.3.0+debian4) unstable; urgency=medium
+
+ * Fix regression in diaspora-common.postrm which removes /bin by mistake
+
+ -- Pirate Praveen <praveen@debian.org> Thu, 23 Mar 2017 13:57:10 +0530
+
+diaspora-installer (0.6.3.0+debian3) unstable; urgency=medium
+
+ * Remove data during purge after user confirmation
+ * Fix directory creation regression in preinst
+ * Fix path for copying source.tar.gz
+ * Correctly handle public directory in preinst backup
+ * Clean diaspora-installer created files
+
+ -- Pirate Praveen <praveen@debian.org> Mon, 20 Mar 2017 18:45:32 +0530
+
+diaspora-installer (0.6.3.0+debian2) unstable; urgency=medium
+
+ * Change section to net (Closes: #832219)
+ * Create public/source.tar.gz only if the file is missing
+ * Fix diaspora backup logic for updates (to remove files removed upstream)
+ (Closes: #856720)
+
+ -- Pirate Praveen <praveen@debian.org> Fri, 17 Mar 2017 11:43:04 +0530
+
diaspora-installer (0.6.3.0+debian1) unstable; urgency=medium
* Install 0.6.3.0 version
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/control diaspora-installer-0.6.5.0+debian1/debian/control
--- diaspora-installer-0.6.3.0+debian1/debian/control 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/control 2017-04-28 15:01:29.000000000 +0530
@@ -1,5 +1,5 @@
Source: diaspora-installer
-Section: ruby
+Section: net
Priority: optional
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
Uploaders: Pirate Praveen <praveen@debian.org>
@@ -15,7 +15,7 @@
Package: diaspora-installer
Architecture: all
-Section: contrib/ruby
+Section: contrib/net
XB-Ruby-Versions: ${ruby:Versions}
Depends: build-essential,
diaspora-common (= ${source:Version}),
@@ -24,7 +24,7 @@
libcurl4-openssl-dev,
libmagickwand-dev,
libpq-dev,
- libssl-dev,
+ libssl1.0-dev,
libxml2-dev,
libxslt-dev,
ruby (>= 2.0) | ruby-interpreter,
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/diaspora-common.config diaspora-installer-0.6.5.0+debian1/debian/diaspora-common.config
--- diaspora-installer-0.6.3.0+debian1/debian/diaspora-common.config 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/diaspora-common.config 2017-04-28 15:01:29.000000000 +0530
@@ -1,11 +1,28 @@
#!/bin/sh
-# config maintainer script for diaspora-installer
+# config maintainer script for diaspora-common
+
+CONFIGFILE=/etc/diaspora.conf
set -e
+
# source debconf stuff
. /usr/share/debconf/confmodule
+# Load config file, if it exists.
+ if [ -e $CONFIGFILE ]; then
+ . $CONFIGFILE || true
+
+ # Store values from config file into
+ # debconf db.
+ db_set diaspora-common/url "$SERVERNAME"
+ db_set diaspora-common/ssl "${ENVIRONMENT_REQUIRE_SSL:-true}"
+ db_set diaspora-common/letsencrypt "${diaspora_letsencrypt:-false}"
+ if [ -n "$diaspora_letsencrypt_email" ]; then
+ db_set diaspora-common/letsencrypt_email "${diaspora_letsencrypt_email}"
+ fi
+ fi
+
# What is your pod address?
db_input high diaspora-common/url || true
db_go
@@ -22,6 +39,14 @@
then
db_input high diaspora-common/letsencrypt || true
db_go
+ db_get diaspora-common/letsencrypt
+ diaspora_letsencrypt=$RET
+ if [ "$diaspora_letsencrypt" = "true" ]; then
+ # Get email for letsencrypt updates
+ db_input high diaspora-common/letsencrypt_email || true
+ db_go
+ fi
+
fi
fi
@@ -146,7 +171,7 @@
if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
. /usr/share/dbconfig-common/dpkg/config
- dbc_dbtypes="mysql, pgsql"
+ dbc_dbtypes="pgsql, mysql"
dbc_dbname="diaspora_production"
dbc_dbuser="diaspora"
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/diaspora-common.install diaspora-installer-0.6.5.0+debian1/debian/diaspora-common.install
--- diaspora-installer-0.6.3.0+debian1/debian/diaspora-common.install 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/diaspora-common.install 2017-04-28 15:01:29.000000000 +0530
@@ -9,6 +9,8 @@
grantpriv.sh usr/lib/diaspora-common/scripts
initdb.sh usr/lib/diaspora-common/scripts
nginx.conf.example usr/share/diaspora-common
+nginx.conf.nohttps.example usr/share/diaspora-common
rake-tasks.sh usr/lib/diaspora-common/scripts
set-env-diaspora.sh usr/lib/diaspora-common/scripts
set-env-nginx.sh usr/lib/diaspora-common/scripts
+sha256sums usr/lib/diaspora-common
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/diaspora-common.postinst diaspora-installer-0.6.5.0+debian1/debian/diaspora-common.postinst
--- diaspora-installer-0.6.3.0+debian1/debian/diaspora-common.postinst 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/diaspora-common.postinst 2017-04-28 15:01:29.000000000 +0530
@@ -42,6 +42,13 @@
mkdir -p /var/cache/diaspora
chown ${diaspora_user}: /var/cache/diaspora
+ # Create temporary directory
+ mkdir -p /run/diaspora
+ chown ${diaspora_user}:www-data /run/diaspora
+ chmod 2750 /run/diaspora
+ ln -fs /var/cache/diaspora /run/diaspora/cache
+ runuser -u ${diaspora_user} -- sh -c 'mkdir -p /run/diaspora/pids'
+
# Create writable directories and files
su ${diaspora_user} -s /bin/sh -c 'mkdir -p ~/.bundle ~/public ~/app-assets'
su ${diaspora_user} -s /bin/sh -c 'touch ~/Gemfile.lock'
@@ -52,24 +59,47 @@
cp ${diaspora_conf_example} ${diaspora_conf_private}
dbc_go diaspora-common "$@"
-
- # Configure pod address.
+
+ cp -a -f ${diaspora_conf_private} ${diaspora_conf_private}.tmp
+
+ # Read from debconf db
db_get diaspora-common/url
- export SERVERNAME=${RET}
- if ! grep SERVERNAME ${diaspora_conf_private}
- then
- echo export SERVERNAME=${SERVERNAME} >> ${diaspora_conf_private}
+ SERVERNAME=${RET}
+ db_get diaspora-common/ssl
+ ENVIRONMENT_REQUIRE_SSL=$RET
+ ENVIRONMENT_URL="https:\/\/$SERVERNAME"
+ if [ "$ENVIRONMENT_REQUIRE_SSL" = "false" ]; then
+ ENVIRONMENT_URL="http:\/\/$SERVERNAME"
fi
-
+ db_get diaspora-common/letsencrypt
+ diaspora_letsencrypt=$RET
+ db_get diaspora-common/letsencrypt_email
+ diaspora_letsencrypt_email=$RET
+
+ # If the admin deleted or commented some variables but then set
+ # them via debconf, (re-)add them to the conffile.
+ test -z "$SERVERNAME" || grep -Eq '^ *SERVERNAME=' ${diaspora_conf_private} || \
+ echo "SERVERNAME=" >> ${diaspora_conf_private}
+ test -z "$ENVIRONMENT_URL" || grep -Eq '^ *ENVIRONMENT_URL=' ${diaspora_conf_private} || \
+ echo "ENVIRONMENT_URL=" >> ${diaspora_conf_private}
+ test -z "$ENVIRONMENT_REQUIRE_SSL" || grep -Eq '^ *ENVIRONMENT_REQUIRE_SSL=' ${diaspora_conf_private} || \
+ echo "ENVIRONMENT_REQUIRE_SSL=" >> ${diaspora_conf_private}
+ test -z "$diaspora_letsencrypt" || grep -Eq '^ *diaspora_letsencrypt=' ${diaspora_conf_private} || \
+ echo "diaspora_letsencrypt=" >> ${diaspora_conf_private}
+ test -z "$diaspora_letsencrypt_email" || grep -Eq '^ *diaspora_letsencrypt_email=' ${diaspora_conf_private} || \
+ echo "diaspora_letsencrypt_email=" >> ${diaspora_conf_private}
+ sed -e "s/^ *SERVERNAME=.*/SERVERNAME=\"$SERVERNAME\"/" \
+ -e "s/^ *ENVIRONMENT_URL=.*/ENVIRONMENT_URL=\"$ENVIRONMENT_URL\"/" \
+ -e "s/^ *ENVIRONMENT_REQUIRE_SSL=.*/ENVIRONMENT_REQUIRE_SSL=\"$ENVIRONMENT_REQUIRE_SSL\"/" \
+ -e "s/^ *diaspora_letsencrypt=.*/diaspora_letsencrypt=\"$diaspora_letsencrypt\"/" \
+ -e "s/^ *diaspora_letsencrypt_email=.*/diaspora_letsencrypt_email=\"$diaspora_letsencrypt_email\"/" \
+ < ${diaspora_conf_private} > ${diaspora_conf_private}.tmp
+ mv -f ${diaspora_conf_private}.tmp ${diaspora_conf_private}
+
# Get ssl choice
db_get diaspora-common/ssl
if [ "${RET}" = "true" ]; then
db_go
- # Configure pod address.
- if ! grep ENVIRONMENT_URL ${diaspora_conf_private}
- then
- echo export ENVIRONMENT_URL="https://$SERVERNAME"; >> ${diaspora_conf_private}
- fi
# Configure nginx if available
if which nginx > /dev/null 2>&1; then
echo "SSL enabled, configuring nginx for ${SERVERNAME}..."
@@ -81,8 +111,7 @@
db_go
# Check if letsencrypt option is selected
- db_get diaspora-common/letsencrypt
- if [ "${RET}" = "true" ]; then
+ if [ "$diaspora_letsencrypt" = "true" ]; then
echo "Configuring letsencrypt..."
mkdir -p /etc/diaspora/ssl
ln -sf /etc/letsencrypt/live/${SERVERNAME}/fullchain.pem \
@@ -99,10 +128,11 @@
echo "Stopping nginx for letsencrypt..."
invoke-rc.d nginx stop
fi
- letsencrypt -d ${SERVERNAME} certonly || {
+ LETSENCRYPT_CMD="letsencrypt --standalone --agree-tos -m $diaspora_letsencrypt_email -d ${SERVERNAME} certonly"
+ $LETSENCRYPT_CMD || {
echo "letsencrypt auto configuration failed..."
echo "Stop your webserver and try running letsencrypt manually..."
- echo "letsencrypt -d ${SERVERNAME} certonly"
+ echo "$LETSENCRYPT_CMD"
}
fi
fi
@@ -110,10 +140,12 @@
db_go
# Configure pod address.
db_get diaspora-common/url
- echo "SSL disabled, skip nginx configuration for ${RET}..."
- if ! grep ENVIRONMENT_URL ${diaspora_conf_private}
- then
- echo export ENVIRONMENT_URL="http://$SERVERNAME:3000"; >> ${diaspora_conf_private}
+ # Configure nginx if available
+ if which nginx > /dev/null 2>&1; then
+ echo "SSL disabled, configuring nginx for ${SERVERNAME}..."
+ /usr/lib/diaspora-common/scripts/set-env-nginx.sh ${SERVERNAME} nohttps
+ else
+ echo "nginx not installed, skipping configuration..."
fi
fi
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/diaspora-common.postrm diaspora-installer-0.6.5.0+debian1/debian/diaspora-common.postrm
--- diaspora-installer-0.6.3.0+debian1/debian/diaspora-common.postrm 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/diaspora-common.postrm 2017-04-28 15:01:29.000000000 +0530
@@ -18,11 +18,14 @@
# This package is being removed, but its configuration has not yet
# been purged.
:
-
- rm -rf /var/libh/diaspora-common/diaspora.conf
+ # stop the service if running
+ if service diaspora status >/dev/null; then
+ service diaspora stop
+ fi
+
+ rm -rf /var/lib/diaspora-common/diaspora.conf
rm -rf /var/lib/diaspora-common/database.yml
rm -rf /var/lib/diaspora-common/nginx-site-diaspora
- rm -rf /var/cache/diaspora /var/log/diaspora
# Remove diversion
# ldconfig is NOT needed during removal of a library, only during
@@ -38,6 +41,41 @@
if [ -e /usr/share/debconf/confmodule ]; then
# Source debconf library.
. /usr/share/debconf/confmodule
+
+ # Do you want to remove all data?
+ db_input high diaspora-common/purge_data|| true
+ db_go
+
+ # Check if we should remove data?
+ db_get diaspora-common/purge_data
+ if [ "${RET}" = "true" ]; then
+ rm -f /etc/dbconfig-common/diaspora-common.conf
+ if which ucf >/dev/null 2>&1; then
+ ucf --purge /etc/dbconfig-common/diaspora-common.conf
+ ucfr --purge diaspora-common /etc/dbconfig-common/diaspora-common.conf
+ fi
+ diaspora_user_home=/var/lib/diaspora
+ if [ -d ${diaspora_user_home} ]; then
+ for i in public app-assets Gemfile.lock .bundle vendor; do
+ if [ -e ${diaspora_user_home}/$i ]; then
+ rm -rf ${diaspora_user_home}/$i
+ fi
+ done
+ fi
+ diaspora_home=/usr/share/diaspora
+ if [ -d ${diaspora_home} ]; then
+ for i in db bin app/assets; do
+ if [ -e ${diaspora_home}/$i ]; then
+ rm -rf ${diaspora_home}/$i
+ fi
+ done
+ fi
+ echo "Removing user: diaspora"
+ if id -u diaspora; then
+ userdel -r diaspora
+ fi
+ fi
+
# Remove my changes to the db.
db_purge
fi
@@ -70,6 +108,8 @@
ucfr --purge diaspora-common /etc/nginx/sites-available/diaspora
fi
+ # remove all configuration files
+ rm -rf /etc/diaspora/*
;;
disappear)
if test "$2" != overwriter; then
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/diaspora-common.templates diaspora-installer-0.6.5.0+debian1/debian/diaspora-common.templates
--- diaspora-installer-0.6.3.0+debian1/debian/diaspora-common.templates 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/diaspora-common.templates 2017-04-28 15:01:29.000000000 +0530
@@ -39,9 +39,8 @@
at /etc/diaspora/ssl. letsencrypt package may be used to automate interaction
with Let's Encrypt to obtain a certificate.
.
- You can disable https if you want to access Diaspora only locally, via
- Unicorn on port 3000. If you disable https, Nginx configuration will be
- skipped.
+ You can disable https if you want to access Diaspora only locally or you don't
+ want to federate with other diaspora pods.
Template: diaspora-common/letsencrypt
Type: boolean
@@ -60,7 +59,13 @@
.
Note: letsencrypt does not have a usable nginx plugin currently, so
certificates must be renewed manually after 3 months, when current
- letsencrypt certificate expire.
+ letsencrypt certificate expire. If you choose this option, you will also be
+ agreeing to letsencrypt terms of service.
+
+Template: diaspora-common/letsencrypt_email
+Type: string
+_Description: Email address for letsencrypt updates:
+ Please provide a valid email address for letsencrypt updates.
Template: diaspora-common/dbbackup
Type: note
@@ -124,3 +129,10 @@
Type: password
_Description: Wordpress Secret:
Give your Wordpress Secret. This can not be blank.
+
+Template: diaspora-common/purge_data
+Type: boolean
+Default: true
+_Description: Remove all data?
+ This will permanently remove all data of this Diaspora instance such as
+ uploaded files and any customizations in homepage.
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/po/cs.po diaspora-installer-0.6.5.0+debian1/debian/po/cs.po
--- diaspora-installer-0.6.3.0+debian1/debian/po/cs.po 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/po/cs.po 2017-04-28 15:01:29.000000000 +0530
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: diaspora-installer 0.3\n"
"Report-Msgid-Bugs-To: diaspora-installer@packages.debian.org\n"
-"POT-Creation-Date: 2017-01-13 19:19+0530\n"
+"POT-Creation-Date: 2017-04-27 12:48+0530\n"
"PO-Revision-Date: 2015-04-03 10:15+0200\n"
"Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -116,9 +116,8 @@
#. Description
#: ../diaspora-common.templates:3001
msgid ""
-"You can disable https if you want to access Diaspora only locally, via "
-"Unicorn on port 3000. If you disable https, Nginx configuration will be "
-"skipped."
+"You can disable https if you want to access Diaspora only locally or you "
+"don't want to federate with other diaspora pods."
msgstr ""
#. Type: boolean
@@ -159,18 +158,31 @@
msgid ""
"Note: letsencrypt does not have a usable nginx plugin currently, so "
"certificates must be renewed manually after 3 months, when current "
-"letsencrypt certificate expire."
+"letsencrypt certificate expire. If you choose this option, you will also be "
+"agreeing to letsencrypt terms of service."
msgstr ""
-#. Type: note
+#. Type: string
#. Description
#: ../diaspora-common.templates:5001
+msgid "Email address for letsencrypt updates:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../diaspora-common.templates:5001
+msgid "Please provide a valid email address for letsencrypt updates."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../diaspora-common.templates:6001
msgid "Backup your database"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"This upgrade includes long running migrations that can take hours to "
"complete on large pods. It is adviced to take a backup of your database."
@@ -178,14 +190,14 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"Commands to backup and restore database is given below (run as root user):"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'pg_dump diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -193,7 +205,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'psql -d diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -201,19 +213,19 @@
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Third party services to be enabled: "
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Diaspora can connect with different services."
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid ""
"When a diaspora instance is connected to a third party service, it allows "
"any user of this diaspora instance to link their account on that service to "
@@ -223,96 +235,110 @@
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Facebook App ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Give your Facebook App ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Facebook Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Give your Facebook Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Twitter Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Give your Twitter Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Twitter Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Give your Twitter Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Tumblr Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Give your Tumblr Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Tumblr Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Give your Tumblr Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Wordpress Client ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Give your Wordpress Client ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Wordpress Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Give your Wordpress Secret. This can not be blank."
msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid "Remove all data?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid ""
+"This will permanently remove all data of this Diaspora instance such as "
+"uploaded files and any customizations in homepage."
+msgstr ""
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/po/da.po diaspora-installer-0.6.5.0+debian1/debian/po/da.po
--- diaspora-installer-0.6.3.0+debian1/debian/po/da.po 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/po/da.po 2017-04-28 15:01:29.000000000 +0530
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: diaspora-installer\n"
"Report-Msgid-Bugs-To: diaspora-installer@packages.debian.org\n"
-"POT-Creation-Date: 2017-01-13 19:19+0530\n"
+"POT-Creation-Date: 2017-04-27 12:48+0530\n"
"PO-Revision-Date: 2015-05-31 17:30+01:00\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -138,10 +138,14 @@
#. Type: boolean
#. Description
#: ../diaspora-common.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can disable https if you want to access Diaspora only locally, via "
+#| "Unicorn on port 3000. If you disable https, Nginx configuration will be "
+#| "skipped."
msgid ""
-"You can disable https if you want to access Diaspora only locally, via "
-"Unicorn on port 3000. If you disable https, Nginx configuration will be "
-"skipped."
+"You can disable https if you want to access Diaspora only locally or you "
+"don't want to federate with other diaspora pods."
msgstr ""
"Du kan deaktivere https, hvis du ønsker kun at tilgå Diapsora lokalt, via "
"Unicorn på port 3000. Hvis du deaktivere https, vil Nginx-konfiguration "
@@ -185,18 +189,31 @@
msgid ""
"Note: letsencrypt does not have a usable nginx plugin currently, so "
"certificates must be renewed manually after 3 months, when current "
-"letsencrypt certificate expire."
+"letsencrypt certificate expire. If you choose this option, you will also be "
+"agreeing to letsencrypt terms of service."
msgstr ""
-#. Type: note
+#. Type: string
+#. Description
+#: ../diaspora-common.templates:5001
+msgid "Email address for letsencrypt updates:"
+msgstr ""
+
+#. Type: string
#. Description
#: ../diaspora-common.templates:5001
+msgid "Please provide a valid email address for letsencrypt updates."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../diaspora-common.templates:6001
msgid "Backup your database"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"This upgrade includes long running migrations that can take hours to "
"complete on large pods. It is adviced to take a backup of your database."
@@ -204,14 +221,14 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"Commands to backup and restore database is given below (run as root user):"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'pg_dump diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -219,7 +236,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'psql -d diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -227,19 +244,19 @@
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Third party services to be enabled: "
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Diaspora can connect with different services."
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid ""
"When a diaspora instance is connected to a third party service, it allows "
"any user of this diaspora instance to link their account on that service to "
@@ -249,96 +266,110 @@
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Facebook App ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Give your Facebook App ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Facebook Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Give your Facebook Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Twitter Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Give your Twitter Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Twitter Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Give your Twitter Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Tumblr Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Give your Tumblr Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Tumblr Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Give your Tumblr Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Wordpress Client ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Give your Wordpress Client ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Wordpress Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Give your Wordpress Secret. This can not be blank."
msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid "Remove all data?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid ""
+"This will permanently remove all data of this Diaspora instance such as "
+"uploaded files and any customizations in homepage."
+msgstr ""
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/po/de.po diaspora-installer-0.6.5.0+debian1/debian/po/de.po
--- diaspora-installer-0.6.3.0+debian1/debian/po/de.po 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/po/de.po 2017-04-28 15:01:29.000000000 +0530
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: diaspora-installer\n"
"Report-Msgid-Bugs-To: diaspora-installer@packages.debian.org\n"
-"POT-Creation-Date: 2017-01-13 19:19+0530\n"
+"POT-Creation-Date: 2017-04-27 12:48+0530\n"
"PO-Revision-Date: 2015-04-01 21:52+0200\n"
"Last-Translator: Erik Pfannenstein <debianignatz@gmx.de>\n"
"Language-Team: de <debian-l10n-german@lists.debian.org>\n"
@@ -117,9 +117,8 @@
#. Description
#: ../diaspora-common.templates:3001
msgid ""
-"You can disable https if you want to access Diaspora only locally, via "
-"Unicorn on port 3000. If you disable https, Nginx configuration will be "
-"skipped."
+"You can disable https if you want to access Diaspora only locally or you "
+"don't want to federate with other diaspora pods."
msgstr ""
#. Type: boolean
@@ -160,18 +159,31 @@
msgid ""
"Note: letsencrypt does not have a usable nginx plugin currently, so "
"certificates must be renewed manually after 3 months, when current "
-"letsencrypt certificate expire."
+"letsencrypt certificate expire. If you choose this option, you will also be "
+"agreeing to letsencrypt terms of service."
msgstr ""
-#. Type: note
+#. Type: string
#. Description
#: ../diaspora-common.templates:5001
+msgid "Email address for letsencrypt updates:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../diaspora-common.templates:5001
+msgid "Please provide a valid email address for letsencrypt updates."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../diaspora-common.templates:6001
msgid "Backup your database"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"This upgrade includes long running migrations that can take hours to "
"complete on large pods. It is adviced to take a backup of your database."
@@ -179,14 +191,14 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"Commands to backup and restore database is given below (run as root user):"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'pg_dump diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -194,7 +206,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'psql -d diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -202,19 +214,19 @@
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Third party services to be enabled: "
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Diaspora can connect with different services."
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid ""
"When a diaspora instance is connected to a third party service, it allows "
"any user of this diaspora instance to link their account on that service to "
@@ -224,96 +236,110 @@
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Facebook App ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Give your Facebook App ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Facebook Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Give your Facebook Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Twitter Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Give your Twitter Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Twitter Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Give your Twitter Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Tumblr Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Give your Tumblr Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Tumblr Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Give your Tumblr Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Wordpress Client ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Give your Wordpress Client ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Wordpress Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Give your Wordpress Secret. This can not be blank."
msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid "Remove all data?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid ""
+"This will permanently remove all data of this Diaspora instance such as "
+"uploaded files and any customizations in homepage."
+msgstr ""
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/po/es.po diaspora-installer-0.6.5.0+debian1/debian/po/es.po
--- diaspora-installer-0.6.3.0+debian1/debian/po/es.po 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/po/es.po 2017-04-28 15:01:29.000000000 +0530
@@ -27,7 +27,7 @@
msgstr ""
"Project-Id-Version: diaspora-installer\n"
"Report-Msgid-Bugs-To: diaspora-installer@packages.debian.org\n"
-"POT-Creation-Date: 2017-01-13 19:19+0530\n"
+"POT-Creation-Date: 2017-04-27 12:48+0530\n"
"PO-Revision-Date: 2015-05-12 11:06-0500\n"
"Last-Translator: Jonathan Bustillos <jathanblackred@openmailbox.com>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -161,10 +161,14 @@
#. Type: boolean
#. Description
#: ../diaspora-common.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can disable https if you want to access Diaspora only locally, via "
+#| "Unicorn on port 3000. If you disable https, Nginx configuration will be "
+#| "skipped."
msgid ""
-"You can disable https if you want to access Diaspora only locally, via "
-"Unicorn on port 3000. If you disable https, Nginx configuration will be "
-"skipped."
+"You can disable https if you want to access Diaspora only locally or you "
+"don't want to federate with other diaspora pods."
msgstr ""
"Puede desactivar https si desea acceder a Diaspora sólo a nivel local, a "
"través de «Unicorn» en el puerto 3000. Si desactiva https, se omitirá la "
@@ -208,18 +212,31 @@
msgid ""
"Note: letsencrypt does not have a usable nginx plugin currently, so "
"certificates must be renewed manually after 3 months, when current "
-"letsencrypt certificate expire."
+"letsencrypt certificate expire. If you choose this option, you will also be "
+"agreeing to letsencrypt terms of service."
msgstr ""
-#. Type: note
+#. Type: string
+#. Description
+#: ../diaspora-common.templates:5001
+msgid "Email address for letsencrypt updates:"
+msgstr ""
+
+#. Type: string
#. Description
#: ../diaspora-common.templates:5001
+msgid "Please provide a valid email address for letsencrypt updates."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../diaspora-common.templates:6001
msgid "Backup your database"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"This upgrade includes long running migrations that can take hours to "
"complete on large pods. It is adviced to take a backup of your database."
@@ -227,14 +244,14 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"Commands to backup and restore database is given below (run as root user):"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'pg_dump diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -242,7 +259,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'psql -d diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -250,19 +267,19 @@
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Third party services to be enabled: "
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Diaspora can connect with different services."
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid ""
"When a diaspora instance is connected to a third party service, it allows "
"any user of this diaspora instance to link their account on that service to "
@@ -272,96 +289,110 @@
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Facebook App ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Give your Facebook App ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Facebook Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Give your Facebook Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Twitter Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Give your Twitter Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Twitter Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Give your Twitter Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Tumblr Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Give your Tumblr Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Tumblr Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Give your Tumblr Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Wordpress Client ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Give your Wordpress Client ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Wordpress Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Give your Wordpress Secret. This can not be blank."
msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid "Remove all data?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid ""
+"This will permanently remove all data of this Diaspora instance such as "
+"uploaded files and any customizations in homepage."
+msgstr ""
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/po/fr.po diaspora-installer-0.6.5.0+debian1/debian/po/fr.po
--- diaspora-installer-0.6.3.0+debian1/debian/po/fr.po 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/po/fr.po 2017-04-28 15:01:29.000000000 +0530
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: diaspora-installer\n"
"Report-Msgid-Bugs-To: diaspora-installer@packages.debian.org\n"
-"POT-Creation-Date: 2017-01-13 19:19+0530\n"
+"POT-Creation-Date: 2017-04-27 12:48+0530\n"
"PO-Revision-Date: 2015-05-12 16:01+0100\n"
"Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
"Language-Team: FRENCH <debian-l10n-french@lists.debian.org>\n"
@@ -142,10 +142,14 @@
#. Type: boolean
#. Description
#: ../diaspora-common.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can disable https if you want to access Diaspora only locally, via "
+#| "Unicorn on port 3000. If you disable https, Nginx configuration will be "
+#| "skipped."
msgid ""
-"You can disable https if you want to access Diaspora only locally, via "
-"Unicorn on port 3000. If you disable https, Nginx configuration will be "
-"skipped."
+"You can disable https if you want to access Diaspora only locally or you "
+"don't want to federate with other diaspora pods."
msgstr ""
"Vous pouvez désactiver https si vous souhaitez seulement accéder à Diaspora "
"localement, via Unicorn sur le port 3000. Si vous désactivez https, la "
@@ -189,18 +193,31 @@
msgid ""
"Note: letsencrypt does not have a usable nginx plugin currently, so "
"certificates must be renewed manually after 3 months, when current "
-"letsencrypt certificate expire."
+"letsencrypt certificate expire. If you choose this option, you will also be "
+"agreeing to letsencrypt terms of service."
msgstr ""
-#. Type: note
+#. Type: string
+#. Description
+#: ../diaspora-common.templates:5001
+msgid "Email address for letsencrypt updates:"
+msgstr ""
+
+#. Type: string
#. Description
#: ../diaspora-common.templates:5001
+msgid "Please provide a valid email address for letsencrypt updates."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../diaspora-common.templates:6001
msgid "Backup your database"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"This upgrade includes long running migrations that can take hours to "
"complete on large pods. It is adviced to take a backup of your database."
@@ -208,14 +225,14 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"Commands to backup and restore database is given below (run as root user):"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'pg_dump diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -223,7 +240,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'psql -d diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -231,19 +248,19 @@
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Third party services to be enabled: "
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Diaspora can connect with different services."
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid ""
"When a diaspora instance is connected to a third party service, it allows "
"any user of this diaspora instance to link their account on that service to "
@@ -253,96 +270,110 @@
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Facebook App ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Give your Facebook App ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Facebook Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Give your Facebook Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Twitter Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Give your Twitter Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Twitter Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Give your Twitter Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Tumblr Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Give your Tumblr Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Tumblr Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Give your Tumblr Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Wordpress Client ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Give your Wordpress Client ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Wordpress Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Give your Wordpress Secret. This can not be blank."
msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid "Remove all data?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid ""
+"This will permanently remove all data of this Diaspora instance such as "
+"uploaded files and any customizations in homepage."
+msgstr ""
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/po/it.po diaspora-installer-0.6.5.0+debian1/debian/po/it.po
--- diaspora-installer-0.6.3.0+debian1/debian/po/it.po 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/po/it.po 2017-04-28 15:01:29.000000000 +0530
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: diaspora-installer\n"
"Report-Msgid-Bugs-To: diaspora-installer@packages.debian.org\n"
-"POT-Creation-Date: 2017-01-13 19:19+0530\n"
+"POT-Creation-Date: 2017-04-27 12:48+0530\n"
"PO-Revision-Date: 2015-09-16 09:38+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -140,10 +140,14 @@
#. Type: boolean
#. Description
#: ../diaspora-common.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can disable https if you want to access Diaspora only locally, via "
+#| "Unicorn on port 3000. If you disable https, Nginx configuration will be "
+#| "skipped."
msgid ""
-"You can disable https if you want to access Diaspora only locally, via "
-"Unicorn on port 3000. If you disable https, Nginx configuration will be "
-"skipped."
+"You can disable https if you want to access Diaspora only locally or you "
+"don't want to federate with other diaspora pods."
msgstr ""
"Si può disabilitare l'https se si desidera accedere a Diaspora solo "
"localmente, via Unicorn sulla porta 3000. Se si disabilita l'https, la "
@@ -187,18 +191,31 @@
msgid ""
"Note: letsencrypt does not have a usable nginx plugin currently, so "
"certificates must be renewed manually after 3 months, when current "
-"letsencrypt certificate expire."
+"letsencrypt certificate expire. If you choose this option, you will also be "
+"agreeing to letsencrypt terms of service."
msgstr ""
-#. Type: note
+#. Type: string
+#. Description
+#: ../diaspora-common.templates:5001
+msgid "Email address for letsencrypt updates:"
+msgstr ""
+
+#. Type: string
#. Description
#: ../diaspora-common.templates:5001
+msgid "Please provide a valid email address for letsencrypt updates."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../diaspora-common.templates:6001
msgid "Backup your database"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"This upgrade includes long running migrations that can take hours to "
"complete on large pods. It is adviced to take a backup of your database."
@@ -206,14 +223,14 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"Commands to backup and restore database is given below (run as root user):"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'pg_dump diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -221,7 +238,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'psql -d diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -229,19 +246,19 @@
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Third party services to be enabled: "
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Diaspora can connect with different services."
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid ""
"When a diaspora instance is connected to a third party service, it allows "
"any user of this diaspora instance to link their account on that service to "
@@ -251,96 +268,110 @@
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Facebook App ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Give your Facebook App ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Facebook Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Give your Facebook Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Twitter Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Give your Twitter Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Twitter Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Give your Twitter Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Tumblr Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Give your Tumblr Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Tumblr Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Give your Tumblr Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Wordpress Client ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Give your Wordpress Client ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Wordpress Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Give your Wordpress Secret. This can not be blank."
msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid "Remove all data?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid ""
+"This will permanently remove all data of this Diaspora instance such as "
+"uploaded files and any customizations in homepage."
+msgstr ""
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/po/ml.po diaspora-installer-0.6.5.0+debian1/debian/po/ml.po
--- diaspora-installer-0.6.3.0+debian1/debian/po/ml.po 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/po/ml.po 2017-04-28 15:01:29.000000000 +0530
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: diaspora-installer\n"
"Report-Msgid-Bugs-To: diaspora-installer@packages.debian.org\n"
-"POT-Creation-Date: 2017-01-13 19:19+0530\n"
+"POT-Creation-Date: 2017-04-27 12:48+0530\n"
"PO-Revision-Date: 2016-12-31 08:34+0530\n"
"Last-Translator: Pirate Praveen <praveen@debian.org>\n"
"Language-Team: Swathanthra Malayalam Computing <discuss@smc.org.in>\n"
@@ -135,10 +135,14 @@
#. Type: boolean
#. Description
#: ../diaspora-common.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can disable https if you want to access Diaspora only locally, via "
+#| "Unicorn on port 3000. If you disable https, Nginx configuration will be "
+#| "skipped."
msgid ""
-"You can disable https if you want to access Diaspora only locally, via "
-"Unicorn on port 3000. If you disable https, Nginx configuration will be "
-"skipped."
+"You can disable https if you want to access Diaspora only locally or you "
+"don't want to federate with other diaspora pods."
msgstr ""
"ഡയൊസ്പൊറ സ്വന്തം കമ്പ്യൂട്ടറില് മാത്രം ഉപയോഗിക്കാനാണെങ്കില് എച്ച്ടിടിപിഎസ് ഒഴിവാക്കാം പകരം "
"യൂണികോണ് (Unicorn) നേരിട്ട് 3000 പോര്ട്ട് വഴി ഉപയോഗിക്കാം. എച്ച്ടിടിപിഎസ് ഒഴിവാക്കിയാല് "
@@ -182,18 +186,31 @@
msgid ""
"Note: letsencrypt does not have a usable nginx plugin currently, so "
"certificates must be renewed manually after 3 months, when current "
-"letsencrypt certificate expire."
+"letsencrypt certificate expire. If you choose this option, you will also be "
+"agreeing to letsencrypt terms of service."
msgstr ""
-#. Type: note
+#. Type: string
+#. Description
+#: ../diaspora-common.templates:5001
+msgid "Email address for letsencrypt updates:"
+msgstr ""
+
+#. Type: string
#. Description
#: ../diaspora-common.templates:5001
+msgid "Please provide a valid email address for letsencrypt updates."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../diaspora-common.templates:6001
msgid "Backup your database"
msgstr "ഡാറ്റാബേസിന്റെ കരുതല് പകര്പ്പെടുക്കുക"
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"This upgrade includes long running migrations that can take hours to "
"complete on large pods. It is adviced to take a backup of your database."
@@ -201,14 +218,14 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"Commands to backup and restore database is given below (run as root user):"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'pg_dump diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -216,7 +233,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'psql -d diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -224,19 +241,19 @@
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Third party services to be enabled: "
msgstr "സജീവമാക്കേണ്ട മറ്റു് സേവനങ്ങള്:"
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Diaspora can connect with different services."
msgstr "മറ്റു് സേവനങ്ങളുമായി ഡയാസ്പൊറ ബന്ധിപ്പിക്കാവുന്നതാണു്."
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid ""
"When a diaspora instance is connected to a third party service, it allows "
"any user of this diaspora instance to link their account on that service to "
@@ -246,100 +263,114 @@
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Facebook App ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Give your Facebook App ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Facebook Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Give your Facebook Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Twitter Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Give your Twitter Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Twitter Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Give your Twitter Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Tumblr Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Give your Tumblr Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Tumblr Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Give your Tumblr Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Wordpress Client ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Give your Wordpress Client ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Wordpress Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Give your Wordpress Secret. This can not be blank."
msgstr ""
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid "Remove all data?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid ""
+"This will permanently remove all data of this Diaspora instance such as "
+"uploaded files and any customizations in homepage."
+msgstr ""
+
#~ msgid "Getting started with diaspora-installer"
#~ msgstr "diaspora-installer പരിചയപ്പെടാം"
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/po/nl.po diaspora-installer-0.6.5.0+debian1/debian/po/nl.po
--- diaspora-installer-0.6.3.0+debian1/debian/po/nl.po 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/po/nl.po 2017-04-28 15:01:29.000000000 +0530
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: diaspora-installer\n"
"Report-Msgid-Bugs-To: diaspora-installer@packages.debian.org\n"
-"POT-Creation-Date: 2017-01-13 19:19+0530\n"
+"POT-Creation-Date: 2017-04-27 12:48+0530\n"
"PO-Revision-Date: 2015-08-31 23:17+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -146,10 +146,14 @@
#. Type: boolean
#. Description
#: ../diaspora-common.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can disable https if you want to access Diaspora only locally, via "
+#| "Unicorn on port 3000. If you disable https, Nginx configuration will be "
+#| "skipped."
msgid ""
-"You can disable https if you want to access Diaspora only locally, via "
-"Unicorn on port 3000. If you disable https, Nginx configuration will be "
-"skipped."
+"You can disable https if you want to access Diaspora only locally or you "
+"don't want to federate with other diaspora pods."
msgstr ""
"U kunt https uitzetten indien u enkel lokaal toegang tot Diaspora wilt via "
"Unicorn op poort 3000. Indien u https uitzet, zal de configuratie van Nginx "
@@ -193,18 +197,31 @@
msgid ""
"Note: letsencrypt does not have a usable nginx plugin currently, so "
"certificates must be renewed manually after 3 months, when current "
-"letsencrypt certificate expire."
+"letsencrypt certificate expire. If you choose this option, you will also be "
+"agreeing to letsencrypt terms of service."
msgstr ""
-#. Type: note
+#. Type: string
+#. Description
+#: ../diaspora-common.templates:5001
+msgid "Email address for letsencrypt updates:"
+msgstr ""
+
+#. Type: string
#. Description
#: ../diaspora-common.templates:5001
+msgid "Please provide a valid email address for letsencrypt updates."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../diaspora-common.templates:6001
msgid "Backup your database"
msgstr "Maak een kopie van uw gegevensbestand"
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"This upgrade includes long running migrations that can take hours to "
"complete on large pods. It is adviced to take a backup of your database."
@@ -215,7 +232,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"Commands to backup and restore database is given below (run as root user):"
msgstr ""
@@ -224,7 +241,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'pg_dump diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -234,7 +251,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'psql -d diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -244,19 +261,19 @@
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Third party services to be enabled: "
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Diaspora can connect with different services."
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid ""
"When a diaspora instance is connected to a third party service, it allows "
"any user of this diaspora instance to link their account on that service to "
@@ -266,100 +283,114 @@
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Facebook App ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Give your Facebook App ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Facebook Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Give your Facebook Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Twitter Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Give your Twitter Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Twitter Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Give your Twitter Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Tumblr Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Give your Tumblr Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Tumblr Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Give your Tumblr Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Wordpress Client ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Give your Wordpress Client ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Wordpress Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Give your Wordpress Secret. This can not be blank."
msgstr ""
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid "Remove all data?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid ""
+"This will permanently remove all data of this Diaspora instance such as "
+"uploaded files and any customizations in homepage."
+msgstr ""
+
#~ msgid ""
#~ "Set the hostname of the machine you're running Diaspora on, as seen from "
#~ "the internet. This should be the domain name you want to use to access "
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/po/pt_BR.po diaspora-installer-0.6.5.0+debian1/debian/po/pt_BR.po
--- diaspora-installer-0.6.3.0+debian1/debian/po/pt_BR.po 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/po/pt_BR.po 2017-04-28 15:01:29.000000000 +0530
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: diaspora-installer\n"
"Report-Msgid-Bugs-To: diaspora-installer@packages.debian.org\n"
-"POT-Creation-Date: 2017-01-13 19:19+0530\n"
+"POT-Creation-Date: 2017-04-27 12:48+0530\n"
"PO-Revision-Date: 2016-03-16 22:36-0300\n"
"Last-Translator: Adriano Rafael Gomes <adrianorg@arg.eti.br>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -140,10 +140,14 @@
#. Type: boolean
#. Description
#: ../diaspora-common.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can disable https if you want to access Diaspora only locally, via "
+#| "Unicorn on port 3000. If you disable https, Nginx configuration will be "
+#| "skipped."
msgid ""
-"You can disable https if you want to access Diaspora only locally, via "
-"Unicorn on port 3000. If you disable https, Nginx configuration will be "
-"skipped."
+"You can disable https if you want to access Diaspora only locally or you "
+"don't want to federate with other diaspora pods."
msgstr ""
"Você pode desabilitar o https se você quiser acessar o Diaspora apenas "
"localmente, via Unicorn na porta 3000. Se você desabilitar o https, a "
@@ -187,18 +191,31 @@
msgid ""
"Note: letsencrypt does not have a usable nginx plugin currently, so "
"certificates must be renewed manually after 3 months, when current "
-"letsencrypt certificate expire."
+"letsencrypt certificate expire. If you choose this option, you will also be "
+"agreeing to letsencrypt terms of service."
msgstr ""
-#. Type: note
+#. Type: string
+#. Description
+#: ../diaspora-common.templates:5001
+msgid "Email address for letsencrypt updates:"
+msgstr ""
+
+#. Type: string
#. Description
#: ../diaspora-common.templates:5001
+msgid "Please provide a valid email address for letsencrypt updates."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../diaspora-common.templates:6001
msgid "Backup your database"
msgstr "Faça cópia de segurança do seu banco de dados"
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"This upgrade includes long running migrations that can take hours to "
"complete on large pods. It is adviced to take a backup of your database."
@@ -209,7 +226,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"Commands to backup and restore database is given below (run as root user):"
msgstr ""
@@ -218,7 +235,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'pg_dump diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -228,7 +245,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'psql -d diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -238,19 +255,19 @@
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Third party services to be enabled: "
msgstr "Serviços de terceiros a habilitar:"
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Diaspora can connect with different services."
msgstr "O Diaspora pode conectar com diferentes serviços."
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid ""
"When a diaspora instance is connected to a third party service, it allows "
"any user of this diaspora instance to link their account on that service to "
@@ -260,96 +277,110 @@
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Facebook App ID:"
msgstr "Facebook App ID:"
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Give your Facebook App ID. This can not be blank."
msgstr "Forneça o seu Facebook App ID. Isso não pode ficar em branco."
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Facebook Secret:"
msgstr "Facebook Secret:"
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Give your Facebook Secret. This can not be blank."
msgstr "Forneça o seu Facebook Secret. Isso não pode ficar em branco."
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Twitter Key:"
msgstr "Twitter Key:"
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Give your Twitter Key. This can not be blank."
msgstr "Forneça o seu Twitter Key. Isso não pode ficar em branco."
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Twitter Secret:"
msgstr "Twitter Secret:"
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Give your Twitter Secret. This can not be blank."
msgstr "Forneça o seu Twitter Secret. Isso não pode ficar em branco."
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Tumblr Key:"
msgstr "Tumblr Key:"
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Give your Tumblr Key. This can not be blank."
msgstr "Forneça o seu Tumblr Key. Isso não pode ficar em branco."
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Tumblr Secret:"
msgstr "Tumblr Secret:"
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Give your Tumblr Secret. This can not be blank."
msgstr "Forneça o seu Tumblr Secret. Isso não pode ficar em branco."
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Wordpress Client ID:"
msgstr "Wordpress Client ID:"
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Give your Wordpress Client ID. This can not be blank."
msgstr "Forneça o seu Wordpress Client ID. Isso não pode ficar em branco."
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Wordpress Secret:"
msgstr "Wordpress Secret:"
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Give your Wordpress Secret. This can not be blank."
msgstr "Forneça o seu Wordpress Secret. Isso não pode ficar em branco."
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid "Remove all data?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid ""
+"This will permanently remove all data of this Diaspora instance such as "
+"uploaded files and any customizations in homepage."
+msgstr ""
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/po/pt.po diaspora-installer-0.6.5.0+debian1/debian/po/pt.po
--- diaspora-installer-0.6.3.0+debian1/debian/po/pt.po 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/po/pt.po 2017-04-28 15:01:29.000000000 +0530
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: diaspora-installer 0.3\n"
"Report-Msgid-Bugs-To: diaspora-installer@packages.debian.org\n"
-"POT-Creation-Date: 2017-01-13 19:19+0530\n"
+"POT-Creation-Date: 2017-04-27 12:48+0530\n"
"PO-Revision-Date: 2015-05-06 23:47+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -130,9 +130,8 @@
#. Description
#: ../diaspora-common.templates:3001
msgid ""
-"You can disable https if you want to access Diaspora only locally, via "
-"Unicorn on port 3000. If you disable https, Nginx configuration will be "
-"skipped."
+"You can disable https if you want to access Diaspora only locally or you "
+"don't want to federate with other diaspora pods."
msgstr ""
#. Type: boolean
@@ -173,18 +172,31 @@
msgid ""
"Note: letsencrypt does not have a usable nginx plugin currently, so "
"certificates must be renewed manually after 3 months, when current "
-"letsencrypt certificate expire."
+"letsencrypt certificate expire. If you choose this option, you will also be "
+"agreeing to letsencrypt terms of service."
msgstr ""
-#. Type: note
+#. Type: string
#. Description
#: ../diaspora-common.templates:5001
+msgid "Email address for letsencrypt updates:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../diaspora-common.templates:5001
+msgid "Please provide a valid email address for letsencrypt updates."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../diaspora-common.templates:6001
msgid "Backup your database"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"This upgrade includes long running migrations that can take hours to "
"complete on large pods. It is adviced to take a backup of your database."
@@ -192,14 +204,14 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"Commands to backup and restore database is given below (run as root user):"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'pg_dump diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -207,7 +219,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'psql -d diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -215,19 +227,19 @@
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Third party services to be enabled: "
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Diaspora can connect with different services."
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid ""
"When a diaspora instance is connected to a third party service, it allows "
"any user of this diaspora instance to link their account on that service to "
@@ -237,100 +249,114 @@
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Facebook App ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Give your Facebook App ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Facebook Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Give your Facebook Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Twitter Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Give your Twitter Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Twitter Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Give your Twitter Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Tumblr Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Give your Tumblr Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Tumblr Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Give your Tumblr Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Wordpress Client ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Give your Wordpress Client ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Wordpress Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Give your Wordpress Secret. This can not be blank."
msgstr ""
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid "Remove all data?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid ""
+"This will permanently remove all data of this Diaspora instance such as "
+"uploaded files and any customizations in homepage."
+msgstr ""
+
#~ msgid "Notes"
#~ msgstr "Notas"
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/po/ru.po diaspora-installer-0.6.5.0+debian1/debian/po/ru.po
--- diaspora-installer-0.6.3.0+debian1/debian/po/ru.po 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/po/ru.po 2017-04-28 15:01:29.000000000 +0530
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: diaspora-installer 0.3\n"
"Report-Msgid-Bugs-To: diaspora-installer@packages.debian.org\n"
-"POT-Creation-Date: 2017-01-13 19:19+0530\n"
+"POT-Creation-Date: 2017-04-27 12:48+0530\n"
"PO-Revision-Date: 2015-04-09 18:56+0300\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -116,9 +116,8 @@
#. Description
#: ../diaspora-common.templates:3001
msgid ""
-"You can disable https if you want to access Diaspora only locally, via "
-"Unicorn on port 3000. If you disable https, Nginx configuration will be "
-"skipped."
+"You can disable https if you want to access Diaspora only locally or you "
+"don't want to federate with other diaspora pods."
msgstr ""
#. Type: boolean
@@ -159,18 +158,31 @@
msgid ""
"Note: letsencrypt does not have a usable nginx plugin currently, so "
"certificates must be renewed manually after 3 months, when current "
-"letsencrypt certificate expire."
+"letsencrypt certificate expire. If you choose this option, you will also be "
+"agreeing to letsencrypt terms of service."
msgstr ""
-#. Type: note
+#. Type: string
#. Description
#: ../diaspora-common.templates:5001
+msgid "Email address for letsencrypt updates:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../diaspora-common.templates:5001
+msgid "Please provide a valid email address for letsencrypt updates."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../diaspora-common.templates:6001
msgid "Backup your database"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"This upgrade includes long running migrations that can take hours to "
"complete on large pods. It is adviced to take a backup of your database."
@@ -178,14 +190,14 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"Commands to backup and restore database is given below (run as root user):"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'pg_dump diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -193,7 +205,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'psql -d diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -201,19 +213,19 @@
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Third party services to be enabled: "
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Diaspora can connect with different services."
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid ""
"When a diaspora instance is connected to a third party service, it allows "
"any user of this diaspora instance to link their account on that service to "
@@ -223,96 +235,110 @@
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Facebook App ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Give your Facebook App ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Facebook Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Give your Facebook Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Twitter Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Give your Twitter Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Twitter Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Give your Twitter Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Tumblr Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Give your Tumblr Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Tumblr Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Give your Tumblr Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Wordpress Client ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Give your Wordpress Client ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Wordpress Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Give your Wordpress Secret. This can not be blank."
msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid "Remove all data?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid ""
+"This will permanently remove all data of this Diaspora instance such as "
+"uploaded files and any customizations in homepage."
+msgstr ""
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/po/sv.po diaspora-installer-0.6.5.0+debian1/debian/po/sv.po
--- diaspora-installer-0.6.3.0+debian1/debian/po/sv.po 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/po/sv.po 2017-04-28 15:01:29.000000000 +0530
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: diaspora-installer\n"
"Report-Msgid-Bugs-To: diaspora-installer@packages.debian.org\n"
-"POT-Creation-Date: 2017-01-13 19:19+0530\n"
+"POT-Creation-Date: 2017-04-27 12:48+0530\n"
"PO-Revision-Date: 2016-04-26 10:04+0100\n"
"Last-Translator: Jonatan Nyberg <jonatan@autistici.org>\n"
"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -139,10 +139,14 @@
#. Type: boolean
#. Description
#: ../diaspora-common.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can disable https if you want to access Diaspora only locally, via "
+#| "Unicorn on port 3000. If you disable https, Nginx configuration will be "
+#| "skipped."
msgid ""
-"You can disable https if you want to access Diaspora only locally, via "
-"Unicorn on port 3000. If you disable https, Nginx configuration will be "
-"skipped."
+"You can disable https if you want to access Diaspora only locally or you "
+"don't want to federate with other diaspora pods."
msgstr ""
"Du kan inaktivera https om du vill komma åt Diaspora endast lokalt, via "
"Unicorn på port 3000. Om du inaktiverar https kommer Nginx konfigurationen "
@@ -186,18 +190,31 @@
msgid ""
"Note: letsencrypt does not have a usable nginx plugin currently, so "
"certificates must be renewed manually after 3 months, when current "
-"letsencrypt certificate expire."
+"letsencrypt certificate expire. If you choose this option, you will also be "
+"agreeing to letsencrypt terms of service."
msgstr ""
-#. Type: note
+#. Type: string
+#. Description
+#: ../diaspora-common.templates:5001
+msgid "Email address for letsencrypt updates:"
+msgstr ""
+
+#. Type: string
#. Description
#: ../diaspora-common.templates:5001
+msgid "Please provide a valid email address for letsencrypt updates."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../diaspora-common.templates:6001
msgid "Backup your database"
msgstr "Säkerhetskopiera din databas"
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"This upgrade includes long running migrations that can take hours to "
"complete on large pods. It is adviced to take a backup of your database."
@@ -208,7 +225,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"Commands to backup and restore database is given below (run as root user):"
msgstr ""
@@ -217,7 +234,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'pg_dump diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -227,7 +244,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'psql -d diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -237,19 +254,19 @@
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Third party services to be enabled: "
msgstr "Tredjepartstjänster som ska aktiveras:"
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Diaspora can connect with different services."
msgstr "Diaspora kan ansluta med olika tjänster."
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid ""
"When a diaspora instance is connected to a third party service, it allows "
"any user of this diaspora instance to link their account on that service to "
@@ -259,96 +276,110 @@
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Facebook App ID:"
msgstr "Facebook App-ID:"
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Give your Facebook App ID. This can not be blank."
msgstr "Ge din Facebook App-ID. Detta kan inte vara tomt."
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Facebook Secret:"
msgstr "Facebook Hemlighet:"
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Give your Facebook Secret. This can not be blank."
msgstr "Ge din Facebook Hemlighet. Det kan inte vara tomt."
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Twitter Key:"
msgstr "Twitter Nyckel:"
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Give your Twitter Key. This can not be blank."
msgstr "Ge din Twitter Nyckel. Detta kan inte vara tomt."
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Twitter Secret:"
msgstr "Twitter Hemlighet:"
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Give your Twitter Secret. This can not be blank."
msgstr "Ge din Twitter Hemlighet. Det kan inte vara tomt."
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Tumblr Key:"
msgstr "Tumblr Nyckel:"
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Give your Tumblr Key. This can not be blank."
msgstr "Ge din Tumblr Hemlighet. Det kan inte vara tomt."
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Tumblr Secret:"
msgstr "Tumblr Hemlighet:"
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Give your Tumblr Secret. This can not be blank."
msgstr "Ge din Tumblr Hemlighet. Det kan inte vara tomt."
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Wordpress Client ID:"
msgstr "Wordpress Klient-ID:"
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Give your Wordpress Client ID. This can not be blank."
msgstr "Ge din Wordpress Klient-ID. Detta kan inte vara tomt."
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Wordpress Secret:"
msgstr "Wordpress Hemlighet:"
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Give your Wordpress Secret. This can not be blank."
msgstr "Ge din Wordpress Hemlighet. Det kan inte vara tomt."
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid "Remove all data?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid ""
+"This will permanently remove all data of this Diaspora instance such as "
+"uploaded files and any customizations in homepage."
+msgstr ""
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/po/templates.pot diaspora-installer-0.6.5.0+debian1/debian/po/templates.pot
--- diaspora-installer-0.6.3.0+debian1/debian/po/templates.pot 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/po/templates.pot 2017-04-28 15:01:29.000000000 +0530
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: diaspora-installer\n"
"Report-Msgid-Bugs-To: diaspora-installer@packages.debian.org\n"
-"POT-Creation-Date: 2017-01-13 19:19+0530\n"
+"POT-Creation-Date: 2017-04-27 12:48+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -109,9 +109,8 @@
#. Description
#: ../diaspora-common.templates:3001
msgid ""
-"You can disable https if you want to access Diaspora only locally, via "
-"Unicorn on port 3000. If you disable https, Nginx configuration will be "
-"skipped."
+"You can disable https if you want to access Diaspora only locally or you "
+"don't want to federate with other diaspora pods."
msgstr ""
#. Type: boolean
@@ -152,18 +151,31 @@
msgid ""
"Note: letsencrypt does not have a usable nginx plugin currently, so "
"certificates must be renewed manually after 3 months, when current "
-"letsencrypt certificate expire."
+"letsencrypt certificate expire. If you choose this option, you will also be "
+"agreeing to letsencrypt terms of service."
msgstr ""
-#. Type: note
+#. Type: string
#. Description
#: ../diaspora-common.templates:5001
+msgid "Email address for letsencrypt updates:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../diaspora-common.templates:5001
+msgid "Please provide a valid email address for letsencrypt updates."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../diaspora-common.templates:6001
msgid "Backup your database"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"This upgrade includes long running migrations that can take hours to "
"complete on large pods. It is adviced to take a backup of your database."
@@ -171,14 +183,14 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"Commands to backup and restore database is given below (run as root user):"
msgstr ""
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'pg_dump diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -186,7 +198,7 @@
#. Type: note
#. Description
-#: ../diaspora-common.templates:5001
+#: ../diaspora-common.templates:6001
msgid ""
"# su postgres -c 'psql -d diaspora_production -f /var/lib/postgresql/"
"diaspora_production.sql'"
@@ -194,19 +206,19 @@
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Third party services to be enabled: "
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid "Diaspora can connect with different services."
msgstr ""
#. Type: multiselect
#. Description
-#: ../diaspora-common.templates:6001
+#: ../diaspora-common.templates:7001
msgid ""
"When a diaspora instance is connected to a third party service, it allows "
"any user of this diaspora instance to link their account on that service to "
@@ -216,96 +228,110 @@
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Facebook App ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:7001
+#: ../diaspora-common.templates:8001
msgid "Give your Facebook App ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Facebook Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:8001
+#: ../diaspora-common.templates:9001
msgid "Give your Facebook Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Twitter Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:9001
+#: ../diaspora-common.templates:10001
msgid "Give your Twitter Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Twitter Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:10001
+#: ../diaspora-common.templates:11001
msgid "Give your Twitter Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Tumblr Key:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:11001
+#: ../diaspora-common.templates:12001
msgid "Give your Tumblr Key. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Tumblr Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:12001
+#: ../diaspora-common.templates:13001
msgid "Give your Tumblr Secret. This can not be blank."
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Wordpress Client ID:"
msgstr ""
#. Type: string
#. Description
-#: ../diaspora-common.templates:13001
+#: ../diaspora-common.templates:14001
msgid "Give your Wordpress Client ID. This can not be blank."
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Wordpress Secret:"
msgstr ""
#. Type: password
#. Description
-#: ../diaspora-common.templates:14001
+#: ../diaspora-common.templates:15001
msgid "Give your Wordpress Secret. This can not be blank."
msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid "Remove all data?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../diaspora-common.templates:16001
+msgid ""
+"This will permanently remove all data of this Diaspora instance such as "
+"uploaded files and any customizations in homepage."
+msgstr ""
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/postinst diaspora-installer-0.6.5.0+debian1/debian/postinst
--- diaspora-installer-0.6.3.0+debian1/debian/postinst 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/postinst 2017-04-28 15:01:29.000000000 +0530
@@ -47,6 +47,7 @@
echo "Installing gems with rubygems ..."
su ${diaspora_user} -s /bin/sh -c "mkdir -p ~/vendor/bundle"
+ su ${diaspora_user} -s /bin/sh -c "touch ~/Gemfile.lock && truncate -s 0 ~/Gemfile.lock"
su ${diaspora_user} -s /bin/sh -c "bundle install --path vendor/bundle --with ${BUNDLE_WITH} --without development test"
# Fix permissions (see #847286)
su ${diaspora_user} -s /bin/sh -c "find vendor/bundle -type f -exec chmod ga-w {} \;"
@@ -56,8 +57,9 @@
echo "Precompiling assets..."
su diaspora -s /bin/sh -c 'bundle exec rake tmp:cache:clear assets:precompile'
+ # preinst creates backup (to be able to remove files removed upstream)
echo "Remove backup..."
- rm -rf ${diaspora_home}-backup.*
+ rm -rf ${diaspora_home}/.backup.*
# Starting diaspora
service diaspora start
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/postrm diaspora-installer-0.6.5.0+debian1/debian/postrm
--- diaspora-installer-0.6.3.0+debian1/debian/postrm 1970-01-01 05:30:00.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/postrm 2017-04-28 15:01:29.000000000 +0530
@@ -0,0 +1,124 @@
+#! /bin/sh
+# postrm.skeleton
+# Skeleton maintainer script showing all the possible cases.
+# Written by Charles Briscoe-Smith, March-June 1998. Public Domain.
+
+# Abort if any command returns an error value
+set -e
+
+# This script is called twice during the removal of the package; once
+# after the removal of the package's files from the system, and as
+# the final step in the removal of this package, after the package's
+# conffiles have been removed.
+
+diaspora_home=/usr/share/diaspora
+# Keep it in sync with preinst
+diaspora_symlinks_list="Gemfile.lock log tmp public app/assets bin/bundle vendor/bundle db/schema.rb config/database.yml config/diaspora.yml"
+diaspora_symlinks_dirs="app bin vendor db config"
+
+case "$1" in
+ remove)
+ # This package is being removed, but its configuration has not yet
+ # been purged.
+ :
+ # stop the service if running
+ if service diaspora status >/dev/null; then
+ service diaspora stop
+ fi
+
+ # These symlinked paths are managed by diaspora-common
+ backup_suffix=$(openssl rand -hex 4)
+ backup_dir=${diaspora_home}/.backup.${backup_suffix}
+ mkdir ${backup_dir}
+
+ # Make parent directories
+ for i in ${diaspora_symlinks_dirs}; do
+ mkdir -p ${backup_dir}/$i
+ done
+
+ for i in ${diaspora_symlinks_list}; do
+ if [ -e ${diaspora_home}/$i ]; then
+ mv ${diaspora_home}/$i ${backup_dir}/$i
+ fi
+ done
+ rm -rf ${diaspora_home}/*
+
+ # Make parent directories
+ for i in ${diaspora_symlinks_dirs}; do
+ mkdir -p ${diaspora_home}/$i
+ done
+ for i in ${diaspora_symlinks_list}; do
+ if [ -e ${backup_dir}/$i ]; then
+ mv ${backup_dir}/$i ${diaspora_home}/$i
+ fi
+ done
+ rm -rf ${backup_dir}
+ rm -rf /var/cache/diaspora-installer
+
+ ;;
+ purge)
+ # This package has previously been removed and is now having
+ # its configuration purged from the system.
+ :
+
+
+ ;;
+ disappear)
+ if test "$2" != overwriter; then
+ echo "$0: undocumented call to \`postrm $*'" 1>&2
+ exit 0
+ fi
+ # This package has been completely overwritten by package $3
+ # (version $4). All our files are already gone from the system.
+ # This is a special case: neither "prerm remove" nor "postrm remove"
+ # have been called, because dpkg didn't know that this package would
+ # disappear until this stage.
+ :
+
+ ;;
+ upgrade)
+ # About to upgrade FROM THIS VERSION to version $2 of this package.
+ # "prerm upgrade" has been called for this version, and "preinst
+ # upgrade" has been called for the new version. Last chance to
+ # clean up.
+ :
+
+ ;;
+ failed-upgrade)
+ # About to upgrade from version $2 of this package TO THIS VERSION.
+ # "prerm upgrade" has been called for the old version, and "preinst
+ # upgrade" has been called for this version. This is only used if
+ # the previous version's "postrm upgrade" couldn't handle it and
+ # returned non-zero. (Fix old postrm bugs here.)
+ :
+
+ ;;
+ abort-install)
+ # Back out of an attempt to install this package. Undo the effects of
+ # "preinst install...". There are two sub-cases.
+ :
+
+ if test "${2+set}" = set; then
+ # When the install was attempted, version $2's configuration
+ # files were still on the system. Undo the effects of "preinst
+ # install $2".
+ :
+
+ else
+ # We were being installed from scratch. Undo the effects of
+ # "preinst install".
+ :
+
+ fi ;;
+ abort-upgrade)
+ # Back out of an attempt to upgrade this package from version $2
+ # TO THIS VERSION. Undo the effects of "preinst upgrade $2".
+ :
+
+ ;;
+ *) echo "$0: didn't understand being called with \`$1'" 1>&2
+ exit 0;;
+esac
+
+#DEBHELPER#
+exit 0
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/preinst diaspora-installer-0.6.5.0+debian1/debian/preinst
--- diaspora-installer-0.6.3.0+debian1/debian/preinst 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/debian/preinst 2017-04-28 15:01:29.000000000 +0530
@@ -3,6 +3,9 @@
diaspora_home=/usr/share/diaspora
+# Keep it in sync with postrm
+diaspora_symlinks_list="Gemfile.lock log tmp public app/assets bin/bundle vendor/bundle db/schema.rb config/database.yml config/diaspora.yml"
+
# Fix bin symlink set by earlier versions
if test -L ${diaspora_home}/bin
then
@@ -10,20 +13,21 @@
fi
# Backup the previous version
-# Just keep the config and vendor/bundle
+# Just keep the modified files/directories
+# We need this to remove files removed upstream
backup() {
- cp -r ${diaspora_home}/config ${diaspora_home}-config
- cp -r ${diaspora_home}/vendor/bundle ${diaspora_home}-vendor-bundle
- cp -r ${diaspora_home}/.bundle ${diaspora_home}.bundle
backup_suffix=$(openssl rand -hex 4)
- mv ${diaspora_home} ${diaspora_home}-backup.${backup-suffix}
- mkdir ${diaspora_home}
- mkdir ${diaspora_home}/vendor
- mv ${diaspora_home}-config ${diaspora_home}/config
- mv ${diaspora_home}-vendor-bundle ${diaspora_home}/vendor/bundle
- mv ${diaspora_home}.bundle ${diaspora_home}/.bundle
- mv ${diaspora_home}-backup.${backup-suffix}/public ${diaspora_home}/public
-
+ backup_dir=${diaspora_home}/.backup.${backup_suffix}
+ mkdir ${backup_dir}
+ mv ${diaspora_home}/* ${backup_dir}
+
+ for i in vendor app bin db config; do
+ mkdir ${diaspora_home}/$i
+ done
+
+ for i in ${diaspora_symlinks_list}; do
+ test -e ${backup_dir}/$i && mv ${backup_dir}/$i ${diaspora_home}/$i
+ done
}
case "$1" in
diff -Nru diaspora-installer-0.6.3.0+debian1/diaspora-common.conf diaspora-installer-0.6.5.0+debian1/diaspora-common.conf
--- diaspora-installer-0.6.3.0+debian1/diaspora-common.conf 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/diaspora-common.conf 2017-04-28 15:01:29.000000000 +0530
@@ -1,4 +1,4 @@
-export diaspora_version=0.6.3.0
+export diaspora_version=0.6.5.0
# possible values branch, tag
export diaspora_release_type=tag
export github_archive_url=https://github.com/diaspora/diaspora/archive
@@ -13,7 +13,9 @@
export diaspora_user_home=/var/lib/diaspora
export diaspora_cache=/var/cache/diaspora-installer
export diaspora_scripts=/usr/lib/diaspora-common/scripts
+export diaspora_sha256sums=/usr/lib/diaspora-common/sha256sums
export diaspora_log_dir=/var/log/diaspora
export diaspora_nginx_log=/var/log/diaspora
export diaspora_ssl_path=/etc/diaspora/ssl
export nginx_conf_example=/usr/share/diaspora-common/nginx.conf.example
+export nginx_conf_nohttps_example=/usr/share/diaspora-common/nginx.conf.nohttps.example
diff -Nru diaspora-installer-0.6.3.0+debian1/diaspora-download.sh diaspora-installer-0.6.5.0+debian1/diaspora-download.sh
--- diaspora-installer-0.6.3.0+debian1/diaspora-download.sh 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/diaspora-download.sh 2017-04-28 15:01:29.000000000 +0530
@@ -25,7 +25,10 @@
wget -O ${diaspora_cache}/diaspora-${diaspora_version}.tar.gz ${github_archive_url}/v${diaspora_version}.tar.gz
fi
fi
-
+
+echo "Checking integrity of download..."
+sha256sum -c ${diaspora_sha256sums}
+
echo "Extracting files..."
tar -C ${diaspora_cache} -zxvf ${diaspora_cache}/diaspora-${diaspora_version}.tar.gz >/dev/null
@@ -33,12 +36,12 @@
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 --exclude public
+rsync -a ${diaspora_cache}/${diaspora_archive}/* ${diaspora_home} --exclude tmp --exclude log --exclude db/schema.rb --exclude app/assets --exclude public --exclude Gemfile.lock
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}/app-assets
cp -r ${diaspora_cache}/${diaspora_archive}/public/* ${diaspora_user_home}/public
chown -R ${diaspora_user}: ${diaspora_user_home}/public
chown -R ${diaspora_user}: ${diaspora_user_home}/app-assets
-echo "Copying source tarball to ${diaspora_home}/public..."
-cp ${diaspora_cache}/diaspora-${diaspora_version}.tar.gz ${diaspora_home}/public/source.tar.gz
+echo "Copying source tarball to ${diaspora_user_home}/public..."
+cp -f ${diaspora_cache}/diaspora-${diaspora_version}.tar.gz ${diaspora_user_home}/public/source.tar.gz
diff -Nru diaspora-installer-0.6.3.0+debian1/migrate-to-0.6.3.0.sh diaspora-installer-0.6.5.0+debian1/migrate-to-0.6.3.0.sh
--- diaspora-installer-0.6.3.0+debian1/migrate-to-0.6.3.0.sh 1970-01-01 05:30:00.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/migrate-to-0.6.3.0.sh 2017-04-28 15:01:29.000000000 +0530
@@ -0,0 +1,61 @@
+# This is required if updating from a version before 0.6.3.0
+test "$(getent passwd diaspora | cut -d: -f6)" = "/var/lib/$user" ||\
+ usermod -d /var/lib/diaspora diaspora
+mkdir -p /var/lib/diaspora
+
+for i in public .bundle Gemfile.lock
+do
+ if [ -L /usr/share/diaspora/$i ]; then
+ echo -n ""
+ elif [ -d /usr/share/diaspora/$i ]; then
+ mv /usr/share/diaspora/$i /var/lib/diaspora
+ ln -sf /var/lib/diaspora/$i /usr/share/diaspora/$i
+ fi
+ mkdir -p /var/lib/diaspora/$i
+done
+
+if [ -L /usr/share/diaspora/app/assets ]; then
+ echo -n ""
+elif [ -d /usr/share/diaspora/app/assets ]; then
+ mkdir -p /var/lib/diaspora/app-assets
+ ln -sf /var/lib/diaspora/app-assets /usr/share/diaspora/app/assets
+fi
+mkdir -p /var/lib/diaspora/app-assets
+
+if [ -L /usr/share/diaspora/vendor/bundle ]; then
+ echo -n ""
+elif [ -d /usr/share/diaspora/vendor/bundle ]; then
+ mv /usr/share/diaspora/vendor/bundle /var/lib/diaspora/vendor-bundle
+ ln -sf /var/lib/diaspora/vendor-bundle /usr/share/diaspora/vendor/bundle
+fi
+mkdir -p /var/lib/diaspora/vendor-bundle
+
+mkdir -p /run/diaspora
+if [ -L /usr/share/diaspora/tmp ]; then
+ echo -n ""
+elif [ -d /usr/share/diaspora/tmp ]; then
+ mv /usr/share/diaspora/tmp/* /run/diaspora/
+ rmdir /usr/share/diaspora/tmp/
+ ln -sf /run/diaspora /usr/share/diaspora/tmp
+fi
+mkdir -p /run/diaspora/pids
+
+mkdir -p /var/log/diaspora
+if [ -L /usr/share/diaspora/log ]; then
+ echo -n ""
+elif [ -d /usr/share/diaspora/log ]; then
+ mv /usr/share/diaspora/log/* /var/log/diaspora/
+ rm -rf /usr/share/diaspora/log
+ ln -sf /var/log/diaspora /usr/share/diaspora/log
+fi
+
+if [ -L /usr/share/diaspora/db/schema.rb ]; then
+ echo -n ""
+elif [ -f /usr/share/diaspora/db/schema.rb ]; then
+ mv /usr/share/diaspora/db/schema.rb /var/lib/diaspora/db-schema.rb
+ ln -sf /var/lib/diaspora/db-schema.rb /usr/share/diaspora/db/schema.rb
+fi
+
+chown diaspora: -R /var/lib/diaspora
+chown diaspora: -R /var/log/diaspora
+chown diaspora:www-data -R /run/diaspora
diff -Nru diaspora-installer-0.6.3.0+debian1/nginx.conf.nohttps.example diaspora-installer-0.6.5.0+debian1/nginx.conf.nohttps.example
--- diaspora-installer-0.6.3.0+debian1/nginx.conf.nohttps.example 1970-01-01 05:30:00.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/nginx.conf.nohttps.example 2017-04-28 15:01:29.000000000 +0530
@@ -0,0 +1,69 @@
+upstream domain11 {
+ server unix:/usr/share/diaspora/tmp/diaspora.sock;
+}
+
+server {
+ listen 80;
+ server_name SERVERNAME_FIXME www.SERVERNAME_FIXME;
+
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-FORWARDED-PROTO http;
+
+ access_log /var/log/diaspora/access.log;
+ error_log /var/log/diaspora/error.log;
+
+ root DIASPORA_ROOT_FIXME/public/;
+ index index2.html;
+
+ if ($http_user_agent ~* Googlebot) {
+ return 403;
+ }
+
+ location /uploads/images {
+ expires 1d;
+ add_header Cache-Control public;
+ }
+
+ location /assets {
+ expires 1d;
+ add_header Cache-Control public;
+ }
+
+ location / {
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Forwarded-Proto http;
+ proxy_redirect off;
+
+ client_max_body_size 4M;
+ client_body_buffer_size 128K;
+
+ if (-f $request_filename/index.html) {
+ rewrite (.*) $1/index.html break;
+ }
+
+ if (-f $request_filename.html) {
+ rewrite (.*) $1.html break;
+ }
+
+ if (!-f $request_filename) {
+ proxy_pass http://domain11;
+
+ break;
+ }
+ }
+
+ if ($http_user_agent ~ "Python-urllib" ) {
+ return 403;
+ }
+
+ if ($http_user_agent ~ "libwww-perl" ) {
+ return 403;
+ }
+
+ error_page 500 502 503 504 /50x.html;
+ location = /50x.html {
+ root DIASPORA_ROOT_FIXME;
+ }
+}
diff -Nru diaspora-installer-0.6.3.0+debian1/rake-tasks.sh diaspora-installer-0.6.5.0+debian1/rake-tasks.sh
--- diaspora-installer-0.6.3.0+debian1/rake-tasks.sh 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/rake-tasks.sh 2017-04-28 15:01:29.000000000 +0530
@@ -2,7 +2,9 @@
# Read configuration values
. /etc/diaspora/diaspora-common.conf
-su diaspora -s /bin/sh -c 'touch public/source.tar.gz'
+# Create an empty public/source.tar.gz for diaspora package
+# script/server checks for its existence
+su diaspora -s /bin/sh -c 'test -f public/source.tar.gz || touch public/source.tar.gz'
if grep https ${diaspora_conf}
then
diff -Nru diaspora-installer-0.6.3.0+debian1/set-env-nginx.sh diaspora-installer-0.6.5.0+debian1/set-env-nginx.sh
--- diaspora-installer-0.6.3.0+debian1/set-env-nginx.sh 2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/set-env-nginx.sh 2017-04-28 15:01:29.000000000 +0530
@@ -1,26 +1,27 @@
#!/bin/sh
if [ "x"$1 = "x" ]
then
- echo "usage: $0 <domain name>"
+ echo "usage: $0 <domain name> [nohttps]"
exit 1
fi
+nginx_site_example=$nginx_conf_example
+if [ "$2" = "nohttps" ]; then
+ nginx_site_example=$nginx_conf_nohttps_example
+fi
+
# Read configuration values
. /etc/diaspora/diaspora-common.conf
nginx_site_private=/var/lib/diaspora-common/nginx-site-diaspora
-if test -f /etc/nginx/sites-available/diaspora; then
- echo "/etc/nginx/sites-available/diaspora already exist, skipping nginx configuration..."
+if test -f ${nginx_site_example}; then
+ sed -e "s/SERVERNAME_FIXME/$1/g" -e "s/DIASPORA_SSL_PATH_FIXME/\\/etc\\/diaspora/"\
+ -e "s/DIASPORA_ROOT_FIXME/\\/usr\\/share\\/diaspora/"\
+ ${nginx_site_example} > ${nginx_site_private}
+ ucf --debconf-ok --three-way ${nginx_site_private} /etc/nginx/sites-available/diaspora
+ ln -fs /etc/nginx/sites-available/diaspora /etc/nginx/sites-enabled/
+ ucfr diaspora-common /etc/nginx/sites-available/diaspora
else
- if test -f ${nginx_conf_example}; then
- sed -e "s/SERVERNAME_FIXME/$1/g" -e "s/DIASPORA_SSL_PATH_FIXME/\\/etc\\/diaspora/"\
- -e "s/DIASPORA_ROOT_FIXME/\\/usr\\/share\\/diaspora/"\
- ${nginx_conf_example} > ${nginx_site_private}
- ucf --debconf-ok --three-way ${nginx_site_private} /etc/nginx/sites-available/diaspora
- ln -fs /etc/nginx/sites-available/diaspora /etc/nginx/sites-enabled/
- ucfr diaspora-common /etc/nginx/sites-available/diaspora
- else
- echo "nginx.conf.example not found"
- exit 1
- fi
-fi
+ echo "nginx.conf.example not found"
+ exit 1
+fi
diff -Nru diaspora-installer-0.6.3.0+debian1/sha256sums diaspora-installer-0.6.5.0+debian1/sha256sums
--- diaspora-installer-0.6.3.0+debian1/sha256sums 1970-01-01 05:30:00.000000000 +0530
+++ diaspora-installer-0.6.5.0+debian1/sha256sums 2017-04-28 15:01:29.000000000 +0530
@@ -0,0 +1 @@
+9800332dbfc18844e3bf3fba18b792ce6aec54abd9884cc6eac8f0de27a538b0 /var/cache/diaspora-installer/diaspora-0.6.5.0.tar.gz
Attachment:
signature.asc
Description: OpenPGP digital signature