jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

PopCorn: create /etc/popcorn only on make_dirs

Browse source 
for #660
This commit is contained in:
maxice8 2019-01-27 09:35:14 -02:00 committed by maxice8
parent 0480d6a236
commit e088a8c3ff
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
srcpkgs/PopCorn/files/popcorn/conf
View file

@ -1,2 +0,0 @@
SERVER=popcorn.voidlinux.org
PORT=8001

5
srcpkgs/PopCorn/files/popcorn/run Executable file → Normal file
View file

@ -2,7 +2,8 @@
[ -r ./conf ] && . ./conf [ -r ./conf ] && . ./conf
mkdir -p /etc/popcorn : ${SERVER:=popcorn.voidlinux.org}
chown -R _popcorn:_popcorn /etc/popcorn : ${PORT:=8001}
chpst -u _popcorn:_popcorn popcorn --server $SERVER --port $PORT chpst -u _popcorn:_popcorn popcorn --server $SERVER --port $PORT
exec chpst -u _popcorn:_popcorn snooze popcorn --server $SERVER --port $PORT exec chpst -u _popcorn:_popcorn snooze popcorn --server $SERVER --port $PORT

2
srcpkgs/PopCorn/files/pqueryd/conf
View file

@ -1,2 +0,0 @@
PORT=8002
DATA_DIR=/srv/www/popcorn/

3
srcpkgs/PopCorn/files/pqueryd/run
View file

@ -2,4 +2,7 @@
[ -r ./conf ] && . ./conf [ -r ./conf ] && . ./conf
: ${PORT=8002}
: ${DATA_DIR=/srv/www/popcorn}
exec chpst -u _popcorn:_popcorn pqueryd --checkpoint_enabled=false --port $PORT --data_dir $DATA_DIR exec chpst -u _popcorn:_popcorn pqueryd --checkpoint_enabled=false --port $PORT --data_dir $DATA_DIR

2
srcpkgs/PopCorn/files/statrepo/conf
View file

@ -1,2 +0,0 @@
PORT=8001
KEY=RESET_KEY

3
srcpkgs/PopCorn/files/statrepo/run Executable file → Normal file
View file

@ -2,4 +2,7 @@
[ -r ./conf ] && . ./conf [ -r ./conf ] && . ./conf
: ${PORT=8001}
: ${KEY=RESET_KEY}
exec chpst -u _popcorn:_popcorn statrepo --port $PORT --reset_key $KEY exec chpst -u _popcorn:_popcorn statrepo --port $PORT --reset_key $KEY

11
srcpkgs/PopCorn/template
View file

@ -1,9 +1,9 @@
# Template file for 'PopCorn' # Template file for 'PopCorn'
pkgname=PopCorn pkgname=PopCorn
version=0.3 version=0.3
revision=3 revision=4
build_style=go build_style=go
go_import_path="github.com/the-maldridge/popcorn" go_import_path=github.com/the-maldridge/popcorn
go_package="${go_import_path}/cmd/popcorn go_package="${go_import_path}/cmd/popcorn
${go_import_path}/cmd/popcornctl ${go_import_path}/cmd/popcornctl
${go_import_path}/cmd/statrepo ${go_import_path}/cmd/statrepo
@ -19,9 +19,9 @@ checksum=5e61970c3ba5fd83f6b5b86c30264213461f4a5af8aacd2ba1757333ece05260
system_accounts="_popcorn" system_accounts="_popcorn"
_popcorn_homedir="/var/lib/popcorn" _popcorn_homedir="/var/lib/popcorn"
make_dirs="/var/lib/popcorn 0755 _popcorn _popcorn make_dirs="
/var/lib/popcorn 0755 _popcorn _popcorn
/etc/popcorn 0755 _popcorn _popcorn" /etc/popcorn 0755 _popcorn _popcorn"
conf_files="/etc/sv/popcorn/conf"
pre_build() { pre_build() {
cd $GOSRCPATH cd $GOSRCPATH
@ -39,8 +39,7 @@ post_install() {
PopCorn-Server_package() { PopCorn-Server_package() {
short_desc+=" - Server" short_desc+=" - Server"
depends="${sourcepkg}>=${version}_${revision}" depends="${sourcepkg}>=${version}_${revision}"
conf_files="/etc/sv/statrepo/conf make_dirs="/srv/www/popcorn 0755 _popcorn _popcorn"
/etc/sv/pqueryd/conf"
pkg_install() { pkg_install() {
vmove usr/bin/statrepo vmove usr/bin/statrepo
vmove usr/bin/popcornctl vmove usr/bin/popcornctl