Hi,
I faced the same SSL dependency problem after the upgarde to 0.21 and also foolowed what is mentioned on the v0.21 anouncement post Version 0.21 is posted
Now I am facing git issues.
If I use the mailinabox command, I get this kind of results :
Mail-in-a-Box Version: v0.21b
Updating system packages…
Installing system packages…
setup/system.sh: line 122: syntax error near unexpected token<<<' setup/system.sh: line 122:<<<<<<< HEAD’
When I go to mailinabox repository and do :
git status
The console shows :
root@box:~/mailinabox# git status
HEAD detached at v0.21b
You have unmerged paths.
(fix conflicts and run “git commit”)
Unmerged paths:
(use “git add …” to mark resolution)
both added: CHANGELOG.md
both added: CONTRIBUTING.md
both added: README.md
both added: conf/zpush/backend_imap.php
both added: management/backup.py
both added: management/dns_update.py
both added: management/ssl_certificates.py
both added: management/status_checks.py
both added: management/templates/aliases.html
both added: management/templates/custom-dns.html
both added: management/templates/index.html
both added: management/templates/ssl.html
both added: management/templates/system-backup.html
both added: setup/bootstrap.sh
both added: setup/mail-postfix.sh
both added: setup/owncloud.sh
both added: setup/preflight.sh
both added: setup/spamassassin.sh
both added: setup/system.sh
both added: setup/webmail.sh
both added: setup/zpush.sh
both added: tests/fail2ban.py
no changes added to commit (use “git add” and/or “git commit -a”)
Even the admin status page is broken. The template seems to have unattended git anotation (like <<<) which are visible when loading the page and break the HTML structure.
Do you think I can do this whithout deleting confing or data files ? :
git fetch --all
git reset --hard origin/master