Browse Source

Move creation of address book

Bob Mottram 8 years ago
parent
commit
95a8ba3960
1 changed files with 9 additions and 5 deletions
  1. 9
    5
      src/freedombone-app-radicale

+ 9
- 5
src/freedombone-app-radicale View File

@@ -83,9 +83,6 @@ function add_user_radicale {
83 83
         echo 'VERSION:2.0' >> /var/www/radicale/collections/${new_username}/calendar
84 84
         echo 'END:VCALENDAR' >> /var/www/radicale/collections/${new_username}/calendar
85 85
 
86
-        addresses_str=$"Addresses"
87
-        echo "{\"tag\": \"VADDRESSBOOK\", \"D:displayname\": \"${addresses_str}\"}" > /var/www/radicale/collections/addresses.props
88
-        touch /var/www/radicale/collections/addresses
89 86
         chown -R www-data:www-data /var/www/radicale
90 87
         chmod -R 755 /var/www/radicale/*
91 88
         systemctl restart radicale
@@ -357,8 +354,6 @@ function install_radicale {
357 354
     if [ ! -d /var/www/radicale/collections ]; then
358 355
         mkdir -p /var/www/radicale/collections
359 356
     fi
360
-    chown -R www-data:www-data /var/www/radicale
361
-    chmod -R 755 /var/www/radicale/collections
362 357
 
363 358
     # create the configuration
364 359
     echo '[server]' >  ${RADICALE_DIRECTORY}/config
@@ -405,6 +400,15 @@ function install_radicale {
405 400
     echo '' >> /etc/systemd/system/radicale.service
406 401
     echo '[Install]' >> /etc/systemd/system/radicale.service
407 402
     echo 'WantedBy=multi-user.target' >> /etc/systemd/system/radicale.service
403
+
404
+    addresses_str=$"Addresses"
405
+    echo "{\"tag\": \"VADDRESSBOOK\", \"D:displayname\": \"${addresses_str}\"}" > /var/www/radicale/collections/addresses.props
406
+    touch /var/www/radicale/collections/addresses
407
+
408
+    chown -R www-data:www-data /var/www/radicale
409
+    chmod -R 755 /var/www/radicale
410
+    chown -R www-data:www-data ${RADICALE_DIRECTORY}
411
+
408 412
     systemctl enable radicale
409 413
     systemctl start radicale
410 414