Commit d51f51da authored by ale's avatar ale

do rsync after update.sh

parent 8a914ac0
......@@ -67,7 +67,6 @@ if [ -e "${root_dir}/build/apache/usr/sbin/apache2" ]; then
apache2="/usr/sbin/apache2"
apache_dir="/test"
chroot="run_in_chroot ${root_dir}/build/apache ${apache_user}"
rsync -ar --delete "${root_dir}/public/" "${root_dir}/build/apache/test/public/"
cp "${root_dir}/test-httpd.conf" "${root_dir}/build/apache/test/test-httpd.conf"
else
for prog in apache2 httpd; do
......@@ -91,6 +90,11 @@ fi
echo "Rendering website..."
"${script_dir}/update.sh"
# Copy files into the chroot _after_ generating the new pages.
if [ -e "${root_dir}/build/apache/usr/sbin/apache2" ]; then
rsync -ar --delete "${root_dir}/public/" "${root_dir}/build/apache/test/public/"
fi
# Start daemons.
echo "Starting daemons in the background..."
sh -c "echo \$\$ > sitesearch.pid ; exec sitesearch --templates='${root_dir}/templates' --http=127.0.0.1:3301" &
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment