summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
-rw-r--r--electrum-server.install57
3 files changed, 3 insertions, 60 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ec12b28e2045..e4971f670c55 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Wed Dec 23 19:48:19 UTC 2015
+# Sun Mar 12 19:19:12 UTC 2017
pkgbase = electrum-server-git
pkgdesc = Server to support Electrum python-based Bitcoin client
- pkgver = 20151128
+ pkgver = 20170312
pkgrel = 1
url = https://github.com/spesmilo/electrum-server
install = electrum-server.install
diff --git a/PKGBUILD b/PKGBUILD
index b30891a4a27e..0f1ced2a6f13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Sebastian Lindqvist <dunpin@gmail.com>
pkgname=electrum-server-git
-pkgver=20151128
+pkgver=20170312
pkgrel=1
pkgdesc="Server to support Electrum python-based Bitcoin client"
arch=('i686' 'x86_64')
diff --git a/electrum-server.install b/electrum-server.install
index 9fd4b5bc46f6..a5e2068cc6f4 100644
--- a/electrum-server.install
+++ b/electrum-server.install
@@ -3,10 +3,6 @@ _es_group=electrum-server
post_install() {
_mkuser
- # disable Copy-On-Write (btrfs directories only)
- for _dir in /usr/share/electrum-server /var/log/electrum-server; do
- _is_btrfs "$_dir" && _disable_cow "$_dir"
- done
chown -R $_es_user:$_es_group /etc/electrum-server \
/etc/electrum-server.conf \
/etc/electrum-server.banner \
@@ -29,11 +25,6 @@ post_remove() {
_rmuser
}
-
-# ------------------------------------------------------------------------------
-# helper functions for creating electrum-server user / group
-# ------------------------------------------------------------------------------
-
_mkuser() {
getent passwd $_es_user &>/dev/null || {
echo -n "Creating electrum-server user... "
@@ -49,54 +40,6 @@ _rmuser() {
echo "done"
}
-
-# ------------------------------------------------------------------------------
-# helper functions for disabling btrfs Copy-On-Write (CoW)
-# https://wiki.archlinux.org/index.php/Btrfs#Copy-On-Write_.28CoW.29
-# ------------------------------------------------------------------------------
-
-# check if dir is btrfs
-_is_btrfs() {
- if [[ $(findmnt --target $1 --output FSTYPE --noheadings) == 'btrfs' ]]; then
- return 0
- else
- return 1
- fi
-}
-
-# disable btrfs CoW
-_chattrify() {
- # original dir, with trailing slash stripped if it exists
- _orig_dir=$( echo "$1" | sed 's@/$@@' )
-
- # if original dir exists, back it up
- [[ -d "$1" ]] && mv "$1" "${_orig_dir}"_old
-
- # re-make original dir
- mkdir -p "$1"
-
- # set permissions on re-made dir
- chmod "$2" "$1"
-
- # disable btrfs CoW on re-made dir
- chattr +C "$1"
-
- # recursive copy to restore backed up dir while maintaining disabled CoW
- [[ -d "${_orig_dir}"_old ]] \
- && find "${_orig_dir}"_old -mindepth 1 -maxdepth 1 -exec cp -R '{}' "$1" \;
-
- # set ownership on re-made dir
- chown -R $3:$4 "$1"
-
- # purge backed up dir
- [[ -d "${_orig_dir}"_old ]] && rm -rf "${_orig_dir}"_old
-}
-
-_disable_cow() {
- _chattrify "$1" "700" "$_es_user" "$_es_group"
-}
-
-
read -d '' ecdsa <<'EOF'
########################################################################
########################################################################