summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonne Haß2021-04-18 15:30:17 +0200
committerJonne Haß2021-04-18 15:30:17 +0200
commit10d38f99dfabb3e8c14bcec26a348b4351045e70 (patch)
treea9e3c9fb3d3b55d18f50f9b091670ace1bd0d5ba
parent5051f7bd7de6229d11e215d0702a2074c5e8bf6b (diff)
downloadaur-10d38f99dfabb3e8c14bcec26a348b4351045e70.tar.gz
diaspora: 0.7.15.0
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD19
2 files changed, 12 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d6f620cbc2de..175b63b16584 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = diaspora-postgresql-git
pkgdesc = A distributed privacy aware social network (development head) (PostgreSQL)
- pkgver = 0.7.14.0.r421.g44bbb44c8
+ pkgver = 0.7.15.0.r487.g85bb022b2
pkgrel = 1
url = https://diasporafoundation.org
install = diaspora.install
@@ -25,6 +25,7 @@ pkgbase = diaspora-postgresql-git
conflicts = diaspora-mysql-git
options = !strip
backup = etc/webapps/diaspora/diaspora.yml
+ backup = etc/webapps/diaspora/diaspora.toml
backup = etc/webapps/diaspora/database.yml
backup = etc/webapps/diaspora/secret_token.rb
source = git+https://github.com/diaspora/diaspora.git#branch=develop
diff --git a/PKGBUILD b/PKGBUILD
index e5a4e0bbe32c..b9d77438a717 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Jonne Haß <me@jhass.eu>
pkgname='diaspora-postgresql-git'
-pkgver=0.7.14.0.r421.g44bbb44c8
+pkgver=0.7.15.0.r487.g85bb022b2
pkgrel=1
pkgdesc="A distributed privacy aware social network (development head) (PostgreSQL)"
arch=('i686' 'x86_64')
@@ -12,6 +12,7 @@ makedepends=('nodejs' 'git')
conflicts=('diaspora-mysql' 'diaspora-postgresql' 'diaspora-mysql-git')
options=(!strip)
backup=("etc/webapps/diaspora/diaspora.yml"
+ "etc/webapps/diaspora/diaspora.toml"
"etc/webapps/diaspora/database.yml"
"etc/webapps/diaspora/secret_token.rb")
install="diaspora.install"
@@ -77,15 +78,15 @@ build() {
HOME=$_builddir C_INCLUDE_PATH=/usr/include:/usr/include/tirpc $_bundle install
msg "Patch configuration examples"
- sed -i -e "s|#certificate_authorities: '/etc/ssl/certs/ca-certificates.crt'|certificate_authorities: '/etc/ssl/certs/ca-certificates.crt'|" \
- -e "s|#rails_environment: 'production'|rails_environment: 'production'|" \
- -e "s|#listen: 'unix:tmp/diaspora.sock'|listen: '/run/diaspora/diaspora.sock'|" \
- $_builddir/config/diaspora.yml.example
+ sed -i -e 's|#certificate_authorities = "/etc/ssl/certs/ca-certificates.crt"|certificate_authorities = "/etc/ssl/certs/ca-certificates.crt"|' \
+ -e 's|#rails_environment = "production"|rails_environment = "production"|' \
+ -e 's|#listen = "unix:tmp/diaspora.sock"|listen = "/run/diaspora/diaspora.sock"|' \
+ $_builddir/config/diaspora.toml.example
sed -i -e "s|<<: \*postgresql|<<: *postgresql|" \
-e "s|#<<: \*mysql||" \
$_builddir/config/database.yml.example
- cp $_builddir/config/diaspora.yml{.example,}
+ cp $_builddir/config/diaspora.toml{.example,}
cp $_builddir/config/database.yml{.example,}
msg "Create secret token"
@@ -94,7 +95,7 @@ build() {
msg "Precompile assets"
HOME=$_builddir RAILS_ENV=production $_bundle exec $_rake assets:precompile
- rm $_builddir/config/{diaspora,database}.yml
+ rm $_builddir/config/{diaspora.toml,database.yml}
}
package() {
@@ -124,7 +125,7 @@ package() {
msg "Prepare configuration files"
install -dm750 $pkgdir/etc/webapps/diaspora
- install -Dm640 $_builddir/config/diaspora.yml.example $pkgdir/etc/webapps/diaspora/diaspora.yml
+ install -Dm640 $_builddir/config/diaspora.toml.example $pkgdir/etc/webapps/diaspora/diaspora.toml
install -Dm640 $_builddir/config/database.yml.example $pkgdir/etc/webapps/diaspora/database.yml
msg "Create symlinks"
@@ -133,7 +134,7 @@ package() {
rm -Rf $pkgdir/usr/share/webapps/diaspora/log \
$pkgdir/usr/share/webapps/diaspora/tmp \
$pkgdir/usr/share/webapps/diaspora/public/uploads
- ln -s /etc/webapps/diaspora/diaspora.yml $pkgdir/usr/share/webapps/diaspora/config/diaspora.yml
+ ln -s /etc/webapps/diaspora/diaspora.toml $pkgdir/usr/share/webapps/diaspora/config/diaspora.toml
ln -s /etc/webapps/diaspora/database.yml $pkgdir/usr/share/webapps/diaspora/config/database.yml
ln -sf /etc/webapps/diaspora/secret_token.rb $pkgdir/usr/share/webapps/diaspora/config/initializers/secret_token.rb
ln -sf /var/lib/diaspora/uploads $pkgdir/usr/share/webapps/diaspora/public/uploads