Skip to content

Commit

Permalink
fixed outstanding items to make default RPM installation work
Browse files Browse the repository at this point in the history
  • Loading branch information
EliAndrewC committed Aug 6, 2014
1 parent 7d0a030 commit beb8f4a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 18 deletions.
6 changes: 4 additions & 2 deletions package-support/preinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@ if ! id -u sideboard &>/dev/null; then
adduser sideboard
fi

mkdir -p /var/run/sideboard
chown sideboard.sideboard /var/run/sideboard
for dname in /var/run/sideboard /var/tmp/sideboard/sessions /opt/sideboard/db /opt/sideboard/plugins; do
mkdir -p $dname
chown sideboard.sideboard $dname
done
4 changes: 3 additions & 1 deletion package-support/sideboard-server.cfg
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
plugins_dir = "/opt/sideboard/plugins"

[cherrypy]
server.socket_host = "0.0.0.0"
tools.sessions.storage_path = "/var/tmp/sideboard/sessions"

[loggers]
root = "INFO"

[handlers]
[[syslog]]
class = "logging.handlers.SysLogHandlers"
class = "logging.handlers.SysLogHandler"
address = "/dev/log"
3 changes: 3 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ mock==1.0.1
Sphinx==1.2.1
coverage==3.6
paver==1.2.2
wheel==0.24.0
pip==1.5.6
sh==1.09
15 changes: 0 additions & 15 deletions sideboard/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,6 @@
from sideboard.lib import log
log.warning('Error importing server', exc_info=True)

# check for arguments which are required for daemon/server but are not required for core
from sideboard.lib import on_startup, config, ConfigurationError
@on_startup
def _check_sometimes_required_options():
missing = []
for optname in ['ldap.url', 'ldap.basedn']:
val = config[optname]
if not val or isinstance(val, (list, tuple)) and not filter(bool, val):
missing.append(optname)

if missing:
message = 'missing configuration options: {}'.format(missing)
log.error(message)
raise ConfigurationError(message)

from sideboard.internal.imports import _discover_plugins
from sideboard.internal.logging import _configure_logging

Expand Down

0 comments on commit beb8f4a

Please sign in to comment.