Rebuild Error Following Upgrade


(Gregory Matthews) #1

We’ve recently upgraded to v1.7.0.beta9 +30. Shortly thereafter, we updated our email settings in app.yml. When trying to rebuild, via sudo ./launcher rebuild app, we get the following error:


Ensuring launcher is up to date
Fetching origin
Updating Launcher
Updating aab5d67…f92ac11
error: Your local changes to the following files would be overwritten by merge:
templates/web.ssl.template.yml
Please, commit your changes or stash them before you can merge.
Aborting
failed to update


The Template referenced here, web.ssl.templates.yml, was modified during our initial installation.

Please advise what we need to do to resolve this issue.

Thanks.


(cpradio) #2

You need to undo those changes (save it off to another file, such as web.ssl.template.custom.yml, by doing the following:

cd /var/discourse
cp templates/web.ssl.template.yml templates/web.ssl.template.custom.yml

Then edit your containers/app.yml to reference web.ssl.template.custom.yml instead of web.ssl.template.yml

Next run the following commands to reset the original web.ssl.template.yml so the rebuild is happy

git reset --hard origin/master
git pull origin master
./launcher rebuild app

(Gregory Matthews) #3

Will do. Thanks for the help.