diff --git a/Dockerfile b/Dockerfile index e82b873..f2704b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ # Password is FROM bikebike/bikebike:14.04 -MAINTAINER Jonathan Rosenbaum +MAINTAINER Jonathan Rosenbaum RUN apt-get update && apt-get -y install apache2-mpm-prefork php5 php5-mysql php5-curl; @@ -22,6 +22,7 @@ COPY local_configurations.php /var/www/html/Connections/ # started with mysqld_safe RUN service mysql start; \ + mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql; \ mysql_install_db; \ mysqladmin create ybdb; \ mysql -e "GRANT ALL PRIVILEGES ON ybdb.* TO 'admin'@'%' IDENTIFIED BY 'yblcatx' with grant option"; \ diff --git a/local_configurations.php b/local_configurations.php index 337ed3c..1e7f73e 100644 --- a/local_configurations.php +++ b/local_configurations.php @@ -13,4 +13,21 @@ define("DEFAULT_SHOP_USER", "Stand Time"); define("DEFAULT_TRANSACTION_TYPE", "Stand Time"); define("CHANGE_FUND", 50); +$etherpad = array( + "host" => "https://demopad.bikelover.org", + "userName" => "PositiveSpin", + "noColors" => true, + "height" => "100%", + "plugins" => array() +); + + +$etherpad_global = array( + "host" => "https://demopad.bikelover.org", + "userName" => "PositiveSpin", + "noColors" => true, + "height" => "100%", + "plugins" => array() +); + ?>