diff --git a/src/freedombone-app-turtl b/src/freedombone-app-turtl index ea09c435..a33bd169 100755 --- a/src/freedombone-app-turtl +++ b/src/freedombone-app-turtl @@ -389,7 +389,6 @@ function install_turtl { function_check add_ddns_domain add_ddns_domain $TURTL_DOMAIN_NAME - cp -r $INSTALL_DIR/lisp/* /var/www/$TURTL_DOMAIN_NAME/htdocs sed -i 's|CCL_DEFAULT_DIRECTORY=.*|CCL_DEFAULT_DIRECTORY=$HOME/ccl|g' /var/www/$TURTL_DOMAIN_NAME/htdocs/ccl/scripts/ccl sed -i 's|CCL_DEFAULT_DIRECTORY=.*|CCL_DEFAULT_DIRECTORY=$HOME/ccl|g' /var/www/$TURTL_DOMAIN_NAME/htdocs/ccl/scripts/ccl64 diff --git a/src/freedombone-utils-database b/src/freedombone-utils-database index 8fb56b2f..525d06a0 100755 --- a/src/freedombone-utils-database +++ b/src/freedombone-utils-database @@ -299,11 +299,27 @@ function install_rethinkdb { wget -qO- https://download.rethinkdb.com/apt/pubkey.gpg | apt-key add - apt-get update apt-get -yq install rethinkdb - if [ ! -f /etc/rethinkdb/default.conf.sample ]; then - echo $'rethinkdb example configuration not found' - exit 78252 - fi - cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/default.conf + + echo '# runuser=rethinkdb' > /etc/rethinkdb/instances.d/default.conf + echo '# rungroup=rethinkdb' >> /etc/rethinkdb/instances.d/default.conf + echo '# pid-file=/var/run/rethinkdb/rethinkdb.pid' >> /etc/rethinkdb/instances.d/default.conf + echo '# directory=/var/lib/rethinkdb/default' >> /etc/rethinkdb/instances.d/default.conf + echo 'log-file=/var/log/rethinkdb' >> /etc/rethinkdb/instances.d/default.conf + echo '# bind=127.0.0.1' >> /etc/rethinkdb/instances.d/default.conf + echo '# canonical-address=' >> /etc/rethinkdb/instances.d/default.conf + echo '# driver-port=28015' >> /etc/rethinkdb/instances.d/default.conf + echo '# cluster-port=29015' >> /etc/rethinkdb/instances.d/default.conf + echo '# join=example.com:29015' >> /etc/rethinkdb/instances.d/default.conf + echo '# port-offset=0' >> /etc/rethinkdb/instances.d/default.conf + echo '# reql-http-proxy=socks5://example.com:1080' >> /etc/rethinkdb/instances.d/default.conf + echo '# http-port=8080' >> /etc/rethinkdb/instances.d/default.conf + echo '# no-http-admin' >> /etc/rethinkdb/instances.d/default.conf + echo '# cores=2' >> /etc/rethinkdb/instances.d/default.conf + echo '# cache-size=1024' >> /etc/rethinkdb/instances.d/default.conf + echo '# io-threads=64' >> /etc/rethinkdb/instances.d/default.conf + echo '# direct-io' >> /etc/rethinkdb/instances.d/default.conf + echo '# server-name=server1' >> /etc/rethinkdb/instances.d/default.conf + systemctl restart rethinkdb }