Bug#988190: unblock: diaspora-installer/0.7.14.0+debian2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package diaspora-installer
[ Reason ]
This fixes rc bug #986286
[ Impact ]
This is a grave bug and diaspora-installer installation itself breaks.
[ Tests ]
Manually tested the changes.
[ Risks ]
No risks as current package does not work.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
There was an nmu that fixes it with a patch, but that adds extra
maintenance burden and switching to the fixed upstream version is easy
to maintain.
unblock diaspora-installer/0.7.14.0+debian2
diff -Nru diaspora-installer-0.7.14.0+debian2/debian/changelog diaspora-installer-0.7.15.0+debian/debian/changelog
--- diaspora-installer-0.7.14.0+debian2/debian/changelog 2020-10-05 22:33:21.000000000 +0530
+++ diaspora-installer-0.7.15.0+debian/debian/changelog 2021-05-07 14:13:07.000000000 +0530
@@ -1,3 +1,12 @@
+diaspora-installer (0.7.15.0+debian) unstable; urgency=medium
+
+ * Fix diaspora-sidekiq.service (make it part of gitlab.service)
+ * Update README and add details of systemd service files
+ * Mention debian specific documentation location at the end of installation
+ * Install diaspora 0.7.15 (Closes: #986286)
+
+ -- Pirate Praveen <praveen@debian.org> Fri, 07 May 2021 14:13:07 +0530
+
diaspora-installer (0.7.14.0+debian2) unstable; urgency=medium
* Include changelog from experimental branch
diff -Nru diaspora-installer-0.7.14.0+debian2/debian/diaspora-common.diaspora-sidekiq.service diaspora-installer-0.7.15.0+debian/debian/diaspora-common.diaspora-sidekiq.service
--- diaspora-installer-0.7.14.0+debian2/debian/diaspora-common.diaspora-sidekiq.service 2020-10-05 22:33:21.000000000 +0530
+++ diaspora-installer-0.7.15.0+debian/debian/diaspora-common.diaspora-sidekiq.service 2021-05-07 14:13:07.000000000 +0530
@@ -4,7 +4,7 @@
Requires=redis-server.service
Wants=postgresql.service
After=redis-server.service postgresql.service
-PartOf=gitlab.service
+PartOf=diaspora.service
ReloadPropagatedFrom=diaspora.service
[Service]
diff -Nru diaspora-installer-0.7.14.0+debian2/diaspora-common.conf diaspora-installer-0.7.15.0+debian/diaspora-common.conf
--- diaspora-installer-0.7.14.0+debian2/diaspora-common.conf 2020-10-05 22:33:21.000000000 +0530
+++ diaspora-installer-0.7.15.0+debian/diaspora-common.conf 2021-05-07 14:13:07.000000000 +0530
@@ -1,5 +1,5 @@
# If diaspora_version is changed, update sha256sums as well
-export diaspora_version=0.7.14.0
+export diaspora_version=0.7.15.0
# possible values branch, tag
export diaspora_release_type=tag
export github_archive_url=https://github.com/diaspora/diaspora/archive
diff -Nru diaspora-installer-0.7.14.0+debian2/rake-tasks.sh diaspora-installer-0.7.15.0+debian/rake-tasks.sh
--- diaspora-installer-0.7.14.0+debian2/rake-tasks.sh 2020-10-05 22:33:21.000000000 +0530
+++ diaspora-installer-0.7.15.0+debian/rake-tasks.sh 2021-05-07 14:13:07.000000000 +0530
@@ -13,8 +13,6 @@
echo "And reload nginx, run # /etc/init.d/nginx reload"
fi
-echo "To stop diaspora, run # /etc/init.d/diaspora stop"
-echo "To see the service status, run # /etc/init.d/diaspora status"
-echo "To start diaspora service, run # /etc/init.d/diaspora start"
+echo "Debian specific documentation is available at /usr/share/doc/diaspora-common/README"
echo "Visit your pod at $ENVIRONMENT_URL"
diff -Nru diaspora-installer-0.7.14.0+debian2/README diaspora-installer-0.7.15.0+debian/README
--- diaspora-installer-0.7.14.0+debian2/README 2020-10-05 22:33:21.000000000 +0530
+++ diaspora-installer-0.7.15.0+debian/README 2021-05-07 14:13:07.000000000 +0530
@@ -18,6 +18,8 @@
- contains the database configuration and diaspora configuration yml files which
are copied to (/usr/share/diaspora)
- contains the init script (which will be copied to /etc/init.d/diaspora)
+- contains systemd unit files (diaspora.service, diaspora-sidekiq.service and
+ diaspora-unicorn.service)
- contains diaspora.conf that is used during the setup
- contains other scripts (adduser, grantpriv, explained later)
@@ -29,13 +31,13 @@
- adduser.sh, grantpriv.sh, set-env-nginx.sh are put in
/usr/lib/diaspora-common/scripts
- diaspora-common.init becomes the /etc/init.d/diaspora
+- systemd unit files are installed in /lib/systemd/system/
The "config" file gets run and
-- sets all the variables required in /etc/diaspora.conf
+- sets all the variables required in /etc/diaspora/diaspora.conf
- copies nginx.conf.example to /etc/nginx-sites-available/ and symlinks in
sites-enabled
-
diaspora-common postinst does the following:
- runs adduser.sh to create 'diaspora' user with no login possible.
- runs grantpriv.sh to set diaspora_production database's owner to diaspora.
@@ -44,9 +46,11 @@
metadata
diaspora-installer postinst does the following:
-- the download of the actual diaspora code from git.
+- the download of the actual diaspora code from github.com (as tar.gz using the
+ tags page matching the version provided in diaspora-common.conf)
+- verifies the checksum for the downloaded tarball against its known value
- copies that to /usr/share/diaspora/
-- `bundle install` all gems based on Gemfile
+- `bundle install` all gems based on Gemfile.lock
- bundle exec rake db:create db:migrate
- bundle exec rake assets:precompile
- creating and saving secret token
@@ -56,6 +60,7 @@
Running
===
+systemctl {start|stop|status|restart} diaspora
/etc/init.d/diaspora {start|stop|status|restart|force-reload}
service diaspora {start|stop|status|restart|force-reload}
@@ -68,7 +73,6 @@
sudo systemctl stop diaspora
sudo systemctl start diaspora
-
Troubleshooting
===
@@ -76,7 +80,7 @@
and run commands as diaspora user
cd /usr/share/diaspora
-. /etc/diaspora.conf
+export $(cat /etc/diaspora/diaspora.conf | xargs)
sudo -u diaspora -E -H bundle exec gem show unicorn
You can check if unicorn is running on port 3000 by running
@@ -85,6 +89,8 @@
If the diaspora service is not running, check its service log file at
/usr/share/diaspora/log/startscript.log
+Also check any known issues and work arounds at https://wiki.debian.org/Diaspora
+
Update Checklist
===
diff -Nru diaspora-installer-0.7.14.0+debian2/sha256sums diaspora-installer-0.7.15.0+debian/sha256sums
--- diaspora-installer-0.7.14.0+debian2/sha256sums 2020-10-05 22:33:21.000000000 +0530
+++ diaspora-installer-0.7.15.0+debian/sha256sums 2021-05-07 14:13:07.000000000 +0530
@@ -1 +1 @@
-747ba7a7e57bdbfee574ebce6622d0f94a068a387943be8fdf33b5d2e960c2db /var/cache/diaspora-installer/diaspora-0.7.14.0.tar.gz
+2f3a1c2e8ebcceced0bfdbdb03a05557d7c37cdceb844327f968c5afc11c756a /var/cache/diaspora-installer/diaspora-0.7.15.0.tar.gz
Reply to: