|
@@ -63,7 +63,7 @@ function add_user_radicale {
|
63
|
63
|
fi
|
64
|
64
|
|
65
|
65
|
if ! grep "$new_username:" ${RADICALE_DIRECTORY}/users; then
|
66
|
|
- htpasswd -Bb ${RADICALE_DIRECTORY}/users "$new_username" "$new_user_password"
|
|
66
|
+ htpasswd -bd ${RADICALE_DIRECTORY}/users "$new_username" "$new_user_password"
|
67
|
67
|
systemctl reload radicale
|
68
|
68
|
fi
|
69
|
69
|
echo '0'
|
|
@@ -229,11 +229,12 @@ function install_radicale {
|
229
|
229
|
echo '[server]' > ${RADICALE_DIRECTORY}/config
|
230
|
230
|
echo 'hosts=127.0.0.1:52322' >> ${RADICALE_DIRECTORY}/config
|
231
|
231
|
echo 'ssl = False' >> ${RADICALE_DIRECTORY}/config
|
|
232
|
+ echo 'daemon = False' >> ${RADICALE_DIRECTORY}/config
|
232
|
233
|
echo '' >> ${RADICALE_DIRECTORY}/config
|
233
|
234
|
echo '[auth]' >> ${RADICALE_DIRECTORY}/config
|
234
|
235
|
echo 'type = htpasswd' >> ${RADICALE_DIRECTORY}/config
|
235
|
236
|
echo "htpasswd_filename = ${RADICALE_DIRECTORY}/users" >> ${RADICALE_DIRECTORY}/config
|
236
|
|
- echo 'htpasswd_encryption = bcrypt' >> ${RADICALE_DIRECTORY}/config
|
|
237
|
+ echo 'htpasswd_encryption = crypt' >> ${RADICALE_DIRECTORY}/config
|
237
|
238
|
echo '' >> ${RADICALE_DIRECTORY}/config
|
238
|
239
|
echo '[rights]' >> ${RADICALE_DIRECTORY}/config
|
239
|
240
|
echo 'type = owner_only' >> ${RADICALE_DIRECTORY}/config
|
|
@@ -254,9 +255,9 @@ function install_radicale {
|
254
|
255
|
if [ ! -f /var/www/radicale ]; then
|
255
|
256
|
mkdir /var/www/radicale
|
256
|
257
|
fi
|
257
|
|
- echo 'import radicale' > /var/www/radicale/radicale.py
|
258
|
|
- echo 'radicale.log.start()' >> /var/www/radicale/radicale.py
|
259
|
|
- echo 'application = radicale.Application()' >> /var/www/radicale/radicale.py
|
|
258
|
+ #echo 'import radicale' > /var/www/radicale/radicale.py
|
|
259
|
+ #echo 'radicale.log.start()' >> /var/www/radicale/radicale.py
|
|
260
|
+ #echo 'application = radicale.Application()' >> /var/www/radicale/radicale.py
|
260
|
261
|
|
261
|
262
|
#echo '[uwsgi]' > /var/www/radicale/uwsgi.ini
|
262
|
263
|
#echo 'plugins = python' >> /var/www/radicale/uwsgi.ini
|
|
@@ -291,13 +292,13 @@ function install_radicale {
|
291
|
292
|
echo '[Unit]' > /etc/systemd/system/radicale.service
|
292
|
293
|
echo 'Description=Radicale CalDAV Server' >> /etc/systemd/system/radicale.service
|
293
|
294
|
echo 'After=network.target' >> /etc/systemd/system/radicale.service
|
294
|
|
- echo 'Requires=uwsgi_rundir.service' >> /etc/systemd/system/radicale.service
|
|
295
|
+ #echo 'Requires=uwsgi_rundir.service' >> /etc/systemd/system/radicale.service
|
295
|
296
|
echo '' >> /etc/systemd/system/radicale.service
|
296
|
297
|
echo '[Service]' >> /etc/systemd/system/radicale.service
|
297
|
298
|
echo 'Type=simple' >> /etc/systemd/system/radicale.service
|
298
|
299
|
echo 'User=www-data' >> /etc/systemd/system/radicale.service
|
299
|
300
|
echo 'Group=www-data' >> /etc/systemd/system/radicale.service
|
300
|
|
- echo 'ExecStart=/var/www/radicale/radicale.py' >> /etc/systemd/system/radicale.service
|
|
301
|
+ echo "ExecStart=/usr/bin/radicale --config ${RADICALE_DIRECTORY}" >> /etc/systemd/system/radicale.service
|
301
|
302
|
echo '' >> /etc/systemd/system/radicale.service
|
302
|
303
|
echo '[Install]' >> /etc/systemd/system/radicale.service
|
303
|
304
|
echo 'WantedBy=multi-user.target' >> /etc/systemd/system/radicale.service
|
|
@@ -323,8 +324,9 @@ function install_radicale {
|
323
|
324
|
echo ' error_log /var/log/radicale/radicale.log warn;' >> /etc/nginx/sites-available/radicale
|
324
|
325
|
echo '' >> /etc/nginx/sites-available/radicale
|
325
|
326
|
echo ' location / {' >> /etc/nginx/sites-available/radicale
|
326
|
|
- echo ' uwsgi_pass unix:/var/run/uwsgi/radicale.sock;' >> /etc/nginx/sites-available/radicale
|
327
|
|
- echo ' include uwsgi_params;' >> /etc/nginx/sites-available/radicale
|
|
327
|
+ echo ' proxy_pass http://localhost:52322;' >> /etc/nginx/sites-available/radicale
|
|
328
|
+ #echo ' uwsgi_pass unix:/var/run/uwsgi/radicale.sock;' >> /etc/nginx/sites-available/radicale
|
|
329
|
+ #echo ' include uwsgi_params;' >> /etc/nginx/sites-available/radicale
|
328
|
330
|
echo ' }' >> /etc/nginx/sites-available/radicale
|
329
|
331
|
echo '}' >> /etc/nginx/sites-available/radicale
|
330
|
332
|
echo '' >> /etc/nginx/sites-available/radicale
|