From 95a8ba3960743f7f904dad94e8b0f45a2cc030bd Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 17 Nov 2016 15:19:48 +0000 Subject: [PATCH] Move creation of address book --- src/freedombone-app-radicale | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/freedombone-app-radicale b/src/freedombone-app-radicale index a029b63b..f87f1596 100755 --- a/src/freedombone-app-radicale +++ b/src/freedombone-app-radicale @@ -83,9 +83,6 @@ function add_user_radicale { echo 'VERSION:2.0' >> /var/www/radicale/collections/${new_username}/calendar echo 'END:VCALENDAR' >> /var/www/radicale/collections/${new_username}/calendar - addresses_str=$"Addresses" - echo "{\"tag\": \"VADDRESSBOOK\", \"D:displayname\": \"${addresses_str}\"}" > /var/www/radicale/collections/addresses.props - touch /var/www/radicale/collections/addresses chown -R www-data:www-data /var/www/radicale chmod -R 755 /var/www/radicale/* systemctl restart radicale @@ -357,8 +354,6 @@ function install_radicale { if [ ! -d /var/www/radicale/collections ]; then mkdir -p /var/www/radicale/collections fi - chown -R www-data:www-data /var/www/radicale - chmod -R 755 /var/www/radicale/collections # create the configuration echo '[server]' > ${RADICALE_DIRECTORY}/config @@ -405,6 +400,15 @@ function install_radicale { echo '' >> /etc/systemd/system/radicale.service echo '[Install]' >> /etc/systemd/system/radicale.service echo 'WantedBy=multi-user.target' >> /etc/systemd/system/radicale.service + + addresses_str=$"Addresses" + echo "{\"tag\": \"VADDRESSBOOK\", \"D:displayname\": \"${addresses_str}\"}" > /var/www/radicale/collections/addresses.props + touch /var/www/radicale/collections/addresses + + chown -R www-data:www-data /var/www/radicale + chmod -R 755 /var/www/radicale + chown -R www-data:www-data ${RADICALE_DIRECTORY} + systemctl enable radicale systemctl start radicale