diff --git a/.gitignore b/.gitignore index 951e8e5..7d4bceb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ conf/settings.ini -cache/* -!cache/README +data/cache/* +!data/cache/README +data/tmp/* +!data/tmp/README diff --git a/conf/settings.ini.dist b/conf/settings.ini.dist index 34cee68..e7560a4 100644 --- a/conf/settings.ini.dist +++ b/conf/settings.ini.dist @@ -75,7 +75,9 @@ credentials = 'rest' [directories] ; Where to store cache data. Defaults to the cache subdirectory ; User running VROOM daemon must have write access -;cache = 'cache' +;cache = 'data/cache' +; Where to store temporary files +;tmp = 'data/tmp' [daemon] ; IP the hypnotoad daemon will listen on. You can use * to bind on every IP/Interface diff --git a/cache/README b/data/cache/README similarity index 100% rename from cache/README rename to data/cache/README diff --git a/data/tmp/README b/data/tmp/README new file mode 100644 index 0000000..56dbb1c --- /dev/null +++ b/data/tmp/README @@ -0,0 +1 @@ +This is where temp data are stored diff --git a/lib/Vroom/Conf.pm b/lib/Vroom/Conf.pm index d282692..6b7eba7 100644 --- a/lib/Vroom/Conf.pm +++ b/lib/Vroom/Conf.pm @@ -39,7 +39,8 @@ sub get_conf(){ $config->{'etherpad.uri'} ||= ''; $config->{'etherpad.api_key'} ||= ''; $config->{'etherpad.base_domain'} ||= ''; - $config->{'directories.cache'} ||= 'cache'; + $config->{'directories.cache'} ||= 'data/cache'; + $config->{'directories.cache'} ||= 'data/tmp'; $config->{'daemon.listen_ip'} ||= '127.0.0.1'; $config->{'daemon.listen_port'} ||= '8090'; $config->{'daemon.backend'} ||= 'hypnotoad'; diff --git a/templates/default/documentation.html.ep b/templates/default/documentation.html.ep index 63ac1a0..32a6577 100644 --- a/templates/default/documentation.html.ep +++ b/templates/default/documentation.html.ep @@ -285,14 +285,14 @@ echo "LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so" \\ > /etc/httpd/conf.modules.d/00-proxy_wstunnel.conf
-- The cache directory must be writeable for the user running the VROOM daemon, which is vroom in the provided systemd unit + The cache and tmp directories must be writeable for the user running the VROOM daemon, which is vroom in the provided systemd unit
-chown -R vroom ./cache -chmod 700 ./cache+chown -R vroom ./data/{tmp,cache} +chmod 700 ./data/{cache,tmp}