aboutsummaryrefslogtreecommitdiffstats
path: root/.homeinstall
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-02-06 10:08:05 +0100
committerMario Vavti <mario@mariovavti.com>2017-02-06 10:08:05 +0100
commite70c87ed413bb1f649d0ee96404f97e3aa3f48b9 (patch)
tree2107c81ca2a35fa25cfaf3f2dcd750f92784d787 /.homeinstall
parent178e3d5bc8237cd6dcf30c1ac0d2e8a24859cc47 (diff)
parenteb3685f5377be06615de66aba104aad6f4927495 (diff)
downloadvolse-hubzilla-e70c87ed413bb1f649d0ee96404f97e3aa3f48b9.tar.gz
volse-hubzilla-e70c87ed413bb1f649d0ee96404f97e3aa3f48b9.tar.bz2
volse-hubzilla-e70c87ed413bb1f649d0ee96404f97e3aa3f48b9.zip
merge dev
Diffstat (limited to '.homeinstall')
-rwxr-xr-x.homeinstall/hubzilla-setup.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/.homeinstall/hubzilla-setup.sh b/.homeinstall/hubzilla-setup.sh
index 6310bf47f..c83fb8de9 100755
--- a/.homeinstall/hubzilla-setup.sh
+++ b/.homeinstall/hubzilla-setup.sh
@@ -491,7 +491,7 @@ END
print_info "letsenrypt exists already (nothing downloaded > no certificate created and registered)"
return 0
fi
- git clone https://github.com/lukas2511/letsencrypt.sh $le_dir
+ git clone https://github.com/lukas2511/dehydrated $le_dir
cd $le_dir
# create config file for letsencrypt.sh
echo "WELLKNOWN=$le_dir" > $le_dir/config.sh
@@ -511,9 +511,9 @@ END
then
die "Failed to load $url_http"
fi
- # run letsencrypt.sh
+ # run script dehydrated
#
- ./letsencrypt.sh --cron --config $le_dir/config.sh
+ ./dehydrated --cron --config $le_dir/config.sh
}
function configure_apache_for_https {
@@ -730,8 +730,8 @@ echo "#" >> /var/www/$hubzilladaily
echo "echo \" \"" >> /var/www/$hubzilladaily
echo "echo \"+++ \$(date) +++\"" >> /var/www/$hubzilladaily
echo "echo \" \"" >> /var/www/$hubzilladaily
-echo "echo \"\$(date) - renew certificat...\"" >> /var/www/$hubzilladaily
-echo "bash $le_dir/letsencrypt.sh --cron --config $le_dir/config.sh" >> /var/www/$hubzilladaily
+echo "echo \"\$(date) - renew certificate...\"" >> /var/www/$hubzilladaily
+echo "bash $le_dir/dehydrated --cron --config $le_dir/config.sh" >> /var/www/$hubzilladaily
echo "#" >> /var/www/$hubzilladaily
echo "# stop hubzilla" >> /var/www/$hubzilladaily
echo "echo \"\$(date) - stoping apache and mysql...\"" >> /var/www/$hubzilladaily
@@ -798,7 +798,7 @@ echo "echo \"\$(date) - db size...\"" >> /var/www/$hubzilladaily
echo "du -h /var/cache/rsnapshot/ | grep mysql/hubzilla" >> /var/www/$hubzilladaily
echo "#" >> /var/www/$hubzilladaily
echo "# update" >> /var/www/$hubzilladaily
-echo "echo \"\$(date) - updating letsencrypt.sh...\"" >> /var/www/$hubzilladaily
+echo "echo \"\$(date) - updating dehydrated...\"" >> /var/www/$hubzilladaily
echo "git -C /var/www/letsencrypt/ pull" >> /var/www/$hubzilladaily
echo "echo \"\$(date) - updating hubhilla core...\"" >> /var/www/$hubzilladaily
echo "git -C /var/www/html/ pull" >> /var/www/$hubzilladaily