diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2020-04-13 03:07:09 -0400 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2020-04-16 04:01:20 -0400 |
commit | eb90638515ee7795f7e0adc0ca4b37f31ee69588 (patch) | |
tree | 4ba414f8abae09f500b6967bcfe773362574754c | |
parent | d8834487af0ffb669b88ecd01e940e291b345e5c (diff) | |
download | abslibre-eb90638515ee7795f7e0adc0ca4b37f31ee69588.tar.gz abslibre-eb90638515ee7795f7e0adc0ca4b37f31ee69588.tar.bz2 abslibre-eb90638515ee7795f7e0adc0ca4b37f31ee69588.zip |
[beanstalkd]: fix service files
-rw-r--r-- | pcr-testing/beanstalkd/PKGBUILD | 6 | ||||
-rw-r--r-- | pcr-testing/beanstalkd/beanstalkd.conf | 11 | ||||
-rw-r--r-- | pcr-testing/beanstalkd/beanstalkd.service | 5 |
3 files changed, 4 insertions, 18 deletions
diff --git a/pcr-testing/beanstalkd/PKGBUILD b/pcr-testing/beanstalkd/PKGBUILD index b6feff46a..5986b03b0 100644 --- a/pcr-testing/beanstalkd/PKGBUILD +++ b/pcr-testing/beanstalkd/PKGBUILD @@ -9,16 +9,13 @@ arch=('armv7h' 'i686' 'x86_64') url=https://beanstalkd.github.io/ license=('MIT') -backup=(etc/conf.d/beanstalkd) source=($pkgname-$pkgver::https://github.com/beanstalkd/beanstalkd/archive/v${pkgver}.tar.gz beanstalkd@.service beanstalkd.service - beanstalkd.conf fix-warnings.patch) sha256sums=('5e3414e49d00e9ef9530897983e56bdba98da6f8f1f30f5fe7e6064b2f68c544' '57004d06ed38973e4bba47c92d1461e77e58027818c1899352ace95fb400f937' - 'ef0393098d6df9afb21ef8d1bc331b3843fcecf6c56498136df1aa38e08f6fbf' - 'ae29f7566e0ac475051a29852e62dbb1ee2b59e2ab03f01676c5b5513ada0e3c' + '9ea87a132244a7b32a2a59ff55d4f809cb109d9021e00014b18fe9883d96b6b6' 'fcb9eaba50bd2bc78e8be9fc05a99501fa38bbe35e7e4568cf8363afe0ee4ac4') @@ -51,7 +48,6 @@ package() make DESTDIR="$pkgdir"/ PREFIX=/usr install - install -Dm644 "${srcdir}"/beanstalkd.conf "${pkgdir}"/etc/conf.d/beanstalkd install -Dm644 "${srcdir}"/beanstalkd.service "${pkgdir}"/usr/lib/systemd/system/beanstalkd.service install -Dm644 "${srcdir}"/beanstalkd@.service "${pkgdir}"/usr/lib/systemd/system/beanstalkd@.service install -Dm644 adm/systemd/beanstalkd.socket "${pkgdir}"/usr/lib/systemd/system/beanstalkd.socket diff --git a/pcr-testing/beanstalkd/beanstalkd.conf b/pcr-testing/beanstalkd/beanstalkd.conf deleted file mode 100644 index d7a89d199..000000000 --- a/pcr-testing/beanstalkd/beanstalkd.conf +++ /dev/null @@ -1,11 +0,0 @@ -## Defaults for the beanstalkd init script -## e.g. /etc/init.d/beanstalkd -## /usr/lib/systemd/system/beanstalkd.service - -BEANSTALKD_LISTEN_ADDR=127.0.0.1 -BEANSTALKD_LISTEN_PORT=11300 - -# You can use BEANSTALKD_EXTRA to pass additional options. -# See beanstalkd(1) for a list of the available options. -# Uncomment the following line for persistent job storage. -#BEANSTALKD_EXTRA="-b /var/lib/beanstalkd" diff --git a/pcr-testing/beanstalkd/beanstalkd.service b/pcr-testing/beanstalkd/beanstalkd.service index 149033fad..7466147e7 100644 --- a/pcr-testing/beanstalkd/beanstalkd.service +++ b/pcr-testing/beanstalkd/beanstalkd.service @@ -6,8 +6,9 @@ After=network.target [Service] User=nobody Group=nobody -EnvironmentFile=/etc/conf.d/beanstalkd -ExecStart=/usr/bin/beanstalkd -l ${BEANSTALKD_LISTEN_ADDR} -p ${BEANSTALKD_LISTEN_PORT} ${BEANSTALKD_EXTRA} +# e.g.: +# ExecStart=/usr/bin/beanstalkd -l 127.0.0.1 -p 11300 -u beanstalker -b /var/lib/beanstalkd +ExecStart=/usr/bin/beanstalkd [Install] WantedBy=multi-user.target |