~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge the Disobedience rewrite.
[disorder]
/
debian
/
postinst.disorder-server
diff --git
a/debian/postinst.disorder-server
b/debian/postinst.disorder-server
index
b5bfaad
..
458cc79
100755
(executable)
--- a/
debian/postinst.disorder-server
+++ b/
debian/postinst.disorder-server
@@
-26,6
+26,9
@@
set -e
add_jukebox_user() {
adduser --quiet --system --group --shell /bin/sh --home /var/lib/disorder \
--no-create-home jukebox
add_jukebox_user() {
adduser --quiet --system --group --shell /bin/sh --home /var/lib/disorder \
--no-create-home jukebox
+ # If it happens that there's no audio group we don't fail; perhaps only
+ # network play was required.
+ adduser jukebox audio || true
}
configure_init_d() {
}
configure_init_d() {
@@
-96,8
+99,6
@@
create_config() {
encoding="$RET"
db_get disorder/port || true
port="$RET"
encoding="$RET"
db_get disorder/port || true
port="$RET"
- db_get disorder/smtp_server || true
- smtp_server="$RET"
db_get disorder/mail_sender || true
mail_sender="$RET"
db_get disorder/interface || true
db_get disorder/mail_sender || true
mail_sender="$RET"
db_get disorder/interface || true
@@
-130,12
+131,6
@@
EOF
if test "$mail_sender" != ""; then
echo "" >> /etc/disorder/conf.debconf.new
if test "$mail_sender" != ""; then
echo "" >> /etc/disorder/conf.debconf.new
- echo "# SMTP server" >> /etc/disorder/conf.debconf.new
- echo "smtp_server $smtp_server" >> /etc/disorder/conf.debconf.new
- fi
-
- if test "$mail_sender" != ""; then
- echo "" >> /etc/disorder/conf.debconf.new
echo "# Source mail address" >> /etc/disorder/conf.debconf.new
echo "mail_sender $mail_sender" >> /etc/disorder/conf.debconf.new
fi
echo "# Source mail address" >> /etc/disorder/conf.debconf.new
echo "mail_sender $mail_sender" >> /etc/disorder/conf.debconf.new
fi