fix user for makepkg

5 files changed, 50 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33d3d87dc27a..2e30ffbc24e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,21 @@
 pkgbase = saturated
 	pkgdesc = Dead simple makepkg builder server
-	pkgver = autogenerated
+	pkgver = 20150921.3_52ef434
 	pkgrel = 1
+	install = saturated.install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = go
 	makedepends = git
+	depends = binutils
+	depends = sudo
 	source = saturated::git://github.com/seletskiy/saturated
 	source = saturated.service
+	source = 20-makepkg
 	md5sums = SKIP
-	md5sums = 8a90d2541638b706e3ac4a43114f995f
+	md5sums = f4440208f5ac1dde58e4b3eca818ab9d
+	md5sums = 2c20ab85afad8668481e61a924193617
 
 pkgname = saturated
 
diff --git a/20-makepkg b/20-makepkg
new file mode 100644
index 000000000000..67e921d73ceb
--- /dev/null
+++ b/20-makepkg
@@ -0,0 +1 @@
+makepkg ALL=(ALL) NOPASSWD: ALL
diff --git a/PKGBUILD b/PKGBUILD
index 0b6838060f95..5bdf1d23d912 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,56 +1,62 @@
 pkgname=saturated
-pkgver="autogenerated"
+pkgver=20150921.3_52ef434
 pkgrel=1
 pkgdesc="Dead simple makepkg builder server"
 arch=('i686' 'x86_64')
 license=('GPL')
+depends=('binutils' 'sudo')
 makedepends=('go' 'git')
+install="saturated.install"
 
 source=(
-	"saturated::git://github.com/seletskiy/saturated"
-	"saturated.service"
+    "saturated::git://github.com/seletskiy/saturated"
+    "saturated.service"
+    "20-makepkg"
 )
 
 md5sums=(
-	'SKIP'
-     'adcc03f700810dadf2f3e30cf801694d'
+    'SKIP'
+    'f4440208f5ac1dde58e4b3eca818ab9d'
+    '2c20ab85afad8668481e61a924193617'
 )
 
 backup=(
 )
 
 pkgver() {
-	cd "$srcdir/$pkgname"
-	local date=$(git log -1 --format="%cd" --date=short | sed s/-//g)
-	local count=$(git rev-list --count HEAD)
-	local commit=$(git rev-parse --short HEAD)
-	echo "$date.${count}_$commit"
+    cd "$srcdir/$pkgname"
+    local date=$(git log -1 --format="%cd" --date=short | sed s/-//g)
+    local count=$(git rev-list --count HEAD)
+    local commit=$(git rev-parse --short HEAD)
+    echo "$date.${count}_$commit"
 }
 
 build() {
-	cd "$srcdir/$pkgname"
+    cd "$srcdir/$pkgname"
 
-	if [ -L "$srcdir/$pkgname" ]; then
-		rm "$srcdir/$pkgname" -rf
-		mv "$srcdir/.go/src/$pkgname/" "$srcdir/$pkgname"
-	fi
+    if [ -L "$srcdir/$pkgname" ]; then
+        rm "$srcdir/$pkgname" -rf
+        mv "$srcdir/.go/src/$pkgname/" "$srcdir/$pkgname"
+    fi
 
-	rm -rf "$srcdir/.go/src"
+    rm -rf "$srcdir/.go/src"
 
-	mkdir -p "$srcdir/.go/src"
+    mkdir -p "$srcdir/.go/src"
 
-	export GOPATH="$srcdir/.go"
+    export GOPATH="$srcdir/.go"
 
-	mv "$srcdir/$pkgname" "$srcdir/.go/src/"
+    mv "$srcdir/$pkgname" "$srcdir/.go/src/"
 
-	cd "$srcdir/.go/src/$pkgname/"
-	ln -sf "$srcdir/.go/src/$pkgname/" "$srcdir/$pkgname"
+    cd "$srcdir/.go/src/$pkgname/"
+    ln -sf "$srcdir/.go/src/$pkgname/" "$srcdir/$pkgname"
 
-	echo "Running 'go get'..."
-	go get
+    echo "Running 'go get'..."
+    go get
 }
 
 package() {
-	install -DT "$srcdir/.go/bin/$pkgname" "$pkgdir/usr/bin/$pkgname"
-	install -DT -m0755 "$srcdir/saturated.service" "$pkgdir/usr/lib/systemd/system/saturated.service"
+    install -DT "$srcdir/.go/bin/$pkgname" "$pkgdir/usr/bin/$pkgname"
+    install -DT -m0755 "$srcdir/saturated.service" "$pkgdir/usr/lib/systemd/system/saturated.service"
+    install -DT -m0640 "$srcdir/20-makepkg" "$pkgdir/etc/sudoers.d/20-makepkg"
+    chmod 0750 "$pkgdir/etc/sudoers.d"
 }
diff --git a/saturated.install b/saturated.install
new file mode 100644
index 000000000000..4c919554e5fa
--- /dev/null
+++ b/saturated.install
@@ -0,0 +1,9 @@
+post_install() {
+    useradd makepkg
+    echo "* Special user 'makepkg' was created."
+    echo "* SSH keys should be placed under /home/makepkg/.ssh/"
+}
+
+pre_remove() {
+    userdel makepkg
+}
diff --git a/saturated.service b/saturated.service
index 935f4d17d9d8..a42f5f047d51 100644
--- a/saturated.service
+++ b/saturated.service
@@ -2,7 +2,8 @@
 Description=Dead simple makepkg builder server
 
 [Service]
-ExecStart=/usr/bin/saturated :80
+User=makepkg
+ExecStart=/usr/bin/saturated :8080
 Restart=always
 
 [Install]