Migrated systemd unit and example config to actual project git repo.

4 files changed, 7 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7365a5981658..e7aaa98b0577 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = weave-minimal-git
 	pkgdesc = minimal weave 1.1 server for Pale Moon sync
-	pkgver = 1.5.r5.g68ecf42
+	pkgver = 1.5.r7.gcaa5dba
 	pkgrel = 1
 	url = https://github.com/zootboy/weave-minimal
 	install = weave-minimal.install
@@ -14,11 +14,7 @@ pkgbase = weave-minimal-git
 	provides = weave-minimal
 	conflicts = weave-minimal
 	source = git+https://github.com/zootboy/weave-minimal
-	source = weave-minimal.conf
-	source = weave-minimal.service
 	sha256sums = SKIP
-	sha256sums = a0439ca506cfd442a2fd47e00688faa2e627dffe01c76083d91945ee38045077
-	sha256sums = 9cba600ecd1d1fd52270b4e6eef31dac0befe5726fc0137bbadd84b6c8ac69fc
 
 pkgname = weave-minimal-git
 
diff --git a/PKGBUILD b/PKGBUILD
index feff79c0ba55..0bec7a75c381 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=weave-minimal
 pkgname=$_pkgname-git
-pkgver=1.5.r5.g68ecf42
+pkgver=1.5.r7.gcaa5dba
 pkgrel=1
 pkgdesc="minimal weave 1.1 server for Pale Moon sync"
 arch=('i686' 'x86_64' 'armv7h')
@@ -13,13 +13,9 @@ depends=('python' 'python-werkzeug')
 optdepends=('python-gevent: better concurrency support')
 provides=('weave-minimal')
 conflicts=('weave-minimal')
-source=("git+https://github.com/zootboy/weave-minimal"
-        "weave-minimal.conf"
-        "weave-minimal.service")
+source=("git+https://github.com/zootboy/weave-minimal")
 install=$_pkgname.install
-sha256sums=('SKIP'
-            'a0439ca506cfd442a2fd47e00688faa2e627dffe01c76083d91945ee38045077'
-            '9cba600ecd1d1fd52270b4e6eef31dac0befe5726fc0137bbadd84b6c8ac69fc')
+sha256sums=('SKIP')
 
 pkgver() {
   cd "$_pkgname"
@@ -38,9 +34,9 @@ build() {
 package() {
   cd "$_pkgname"
 
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  install -Dm644 $srcdir/weave-minimal.conf "$pkgdir/etc/weave-minimal.conf"
-  install -Dm644 $srcdir/weave-minimal.service "$pkgdir/usr/lib/systemd/system/weave-minimal.service"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
+  install -Dm644 $srcdir/$_pkgname/examples/weave-minimal.conf "$pkgdir/etc/weave-minimal.conf"
+  install -Dm644 $srcdir/$_pkgname/examples/weave-minimal.service "$pkgdir/usr/lib/systemd/system/weave-minimal.service"
 
   python setup.py install --root="$pkgdir"
 }
diff --git a/weave-minimal.conf b/weave-minimal.conf
deleted file mode 100644
index 3ed550163896..000000000000
--- a/weave-minimal.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[weave-minimal]
-# Bind address and port.
-host=127.0.0.1
-port=8585
-# Directory where user DB files are placed. Must be writable by "weave" user.
-data-dir=/var/lib/weave/data/
-# Public URL that the weave server can be accessed from.
-base-url=https://EXAMPLE.COM/weave-custom/
-# Log level (printed to STDOUT)
-log-level=INFO
-
-# Uncomment this and restart server to allow new users to register.
-#enable-registration=yes
diff --git a/weave-minimal.service b/weave-minimal.service
deleted file mode 100644
index c675da3199fe..000000000000
--- a/weave-minimal.service
+++ /dev/null
@@ -1,25 +0,0 @@
-[Unit]
-Description=Minimal weave server for Pale Moon sync
-After=network.target
-Requires=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/weave-minimal
-User=weave
-Group=weave
-Restart=on-failure
-RestartSec=300s
-PrivateTmp=yes
-PrivateDevices=yes
-ProtectSystem=strict
-ProtectHome=yes
-ProtectKernelTunables=yes
-ProtectKernelModules=yes
-ProtectControlGroups=yes
-NoNewPrivileges=yes
-ReadWritePaths=/var/lib/weave
-
-[Install]
-WantedBy=multi-user.target
-