diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh index ceb9f3043..ff2d52f2a 100755 --- a/home.admin/_bootstrap.sh +++ b/home.admin/_bootstrap.sh @@ -491,7 +491,7 @@ if [ ${isMounted} -eq 0 ]; then # if setup - run provision setup first if [ "${setupPhase}" == "setup" ]; then - echo "Calling _bootstrap.setup.sh for basic setup tasks .." >> $logFile + echo "Calling _provision.setup.sh for basic setup tasks .." >> $logFile sudo /home/admin/_provision.setup.sh if [ "$?" != "0" ]; then echo "EXIT BECAUSE OF ERROR STATE ($?)" >> $logFile @@ -500,20 +500,9 @@ if [ ${isMounted} -eq 0 ]; then fi fi - # if update - run provision update migration first - if [ "${setupPhase}" == "update" ]; then - echo "Calling _bootstrap.update.sh for possible update migrations .." >> $logFile - sudo /home/admin/_provision.update.sh - if [ "$?" != "0" ]; then - echo "EXIT BECAUSE OF ERROR STATE ($?)" >> $logFile - echo "This can also happen if _provision.update.sh has syntax errros" >> $logFile - exit 1 - fi - fi - - # if update - run provision update migration first + # if migration - run the migration provision first if [ "${setupPhase}" == "migration" ]; then - echo "Calling _bootstrap.migration.sh for possible update migrations .." >> $logFile + echo "Calling _provision.migration.sh for possible migrations .." >> $logFile sudo /home/admin/_provision.migration.sh if [ "$?" != "0" ]; then echo "EXIT BECAUSE OF ERROR STATE ($?)" >> $logFile @@ -522,6 +511,17 @@ if [ ${isMounted} -eq 0 ]; then fi fi + # if update/recovery/migration + if [ "${setupPhase}" == "update" ] || [ "${setupPhase}" == "recovery" ] || [ "${setupPhase}" == "migration" ]; then + echo "Calling _provision.update.sh .." >> $logFile + sudo /home/admin/_provision.update.sh + if [ "$?" != "0" ]; then + echo "EXIT BECAUSE OF ERROR STATE ($?)" >> $logFile + echo "This can also happen if _provision.update.sh has syntax errros" >> $logFile + exit 1 + fi + fi + echo "Calling _bootstrap.provision.sh for general system provisioning (${setupPhase}) .." >> $logFile sudo /home/admin/_provision_.sh if [ "$?" != "0" ]; then diff --git a/home.admin/_provision.setup.sh b/home.admin/_provision.setup.sh index 2ee5a61ad..938e4a298 100755 --- a/home.admin/_provision.setup.sh +++ b/home.admin/_provision.setup.sh @@ -22,20 +22,6 @@ echo "# _provision.setup.sh" >> ${logFile} echo "###################################" >> ${logFile} sudo sed -i "s/^message=.*/message='Provision Setup'/g" ${infoFile} -################################### -# Set Password A - -if [ "${passwordA}" == "" ]; then - sed -i "s/^state=.*/state=error/g" ${infoFile} - sed -i "s/^message=.*/message='config: missing passwordA'/g" ${infoFile} - echo "FAIL see ${logFile}" - echo "FAIL: missing passwordA in (${setupFile})!" >> ${logFile} - exit 1 -fi - -echo "SETTING PASSWORD A" >> ${logFile} -sudo /home/admin/config.scripts/blitz.setpassword.sh a "${passwordA}" >> ${logFile} - ################################### # Preserve SSH keys # just copy dont link anymore diff --git a/home.admin/_provision.update.sh b/home.admin/_provision.update.sh index 6cc736ee2..dcce6692f 100755 --- a/home.admin/_provision.update.sh +++ b/home.admin/_provision.update.sh @@ -9,8 +9,8 @@ infoFile="/home/admin/raspiblitz.info" # CONFIGFILE - configuration of RaspiBlitz configFile="/mnt/hdd/raspiblitz.conf" -# SETUPFILE - configuration of RaspiBlitz -setupFile="/mnt/hdd/raspiblitz.conf" +# SETUPFILE - - setup data of RaspiBlitz +setupFile="/var/cache/raspiblitz/temp/raspiblitz.setup" # log header echo "" >> ${logFile} @@ -60,6 +60,20 @@ fi echo "prechecks OK" >> ${logFile} +################################### +# Set Password A + +if [ "${passwordA}" == "" ]; then + sed -i "s/^state=.*/state=error/g" ${infoFile} + sed -i "s/^message=.*/message='config: missing passwordA'/g" ${infoFile} + echo "FAIL see ${logFile}" + echo "FAIL: missing passwordA in (${setupFile})!" >> ${logFile} + exit 1 +fi + +echo "SETTING PASSWORD A" >> ${logFile} +sudo /home/admin/config.scripts/blitz.setpassword.sh a "${passwordA}" >> ${logFile} + # MIGRATION - DATA CONVERSION when updating config # this is the place if on a future version change # a conversion of config data or app data is needed @@ -219,6 +233,22 @@ else echo "OK - version of config data is up to date" >> ${logFile} fi +# start network service +echo "" +echo "*** Start ${network} ***" >> ${logFile} +sudo sed -i "s/^message=.*/message='Blockchain Testrun'/g" ${infoFile} +echo "- This can take a while .." >> ${logFile} +sudo cp /home/admin/assets/${network}d.service /etc/systemd/system/${network}d.service +#sudo chmod +x /etc/systemd/system/${network}d.service +sudo systemctl daemon-reload >> ${logFile} +sudo systemctl enable ${network}d.service >> ${logFile} +sudo systemctl start ${network}d.service >> ${logFile} + +# start lightning service +echo "Starting LND Service ..." >> ${logFile} +sudo systemctl enable lnd >> ${logFile} +sudo systemctl start lnd >> ${logFile} + echo "END Migration/Init" >> ${logFile} exit 0