Skip to content
This repository has been archived by the owner on May 20, 2022. It is now read-only.

web entrypoint: forcefully link existing config #454

Merged
merged 1 commit into from
Mar 13, 2020
Merged

web entrypoint: forcefully link existing config #454

merged 1 commit into from
Mar 13, 2020

Conversation

potaito
Copy link
Contributor

@potaito potaito commented Mar 9, 2020

When trying to enable SSL, I added the certificate as described here: https://github.com/mattermost/mattermost-docker#install-with-ssl-certificate

However, the web server was still listenting to port 80 instead of port 443 and it took me a moment to see why. The startup output of docker-compose contains this:

web_1  | ln: /etc/nginx/conf.d/mattermost.conf: File exists
web_1  | found certificate and key, linking ssl config

While the second line suggests, that the config mattermost-ssl is being used, the first line tells us, that the linking was not successful, because the symlink already exists from a previous execution. The existing link can be overwritten by adding -f --force to ln.

Related: #366 (#366 would probably need to be updated with the same change)

@hanzei hanzei requested a review from cpanato March 9, 2020 11:04
@hanzei hanzei added the 2: Dev Review Requires review by a core committer label Mar 9, 2020
@potaito
Copy link
Contributor Author

potaito commented Mar 13, 2020

How can I re-run the cla/mattermost check? Force push last commit with new timestamp? :)

@cpanato
Copy link
Contributor

cpanato commented Mar 13, 2020

/check-cla

@cpanato cpanato merged commit 07b368d into mattermost:master Mar 13, 2020
@potaito potaito deleted the force-link-nginx-config branch March 13, 2020 09:14
lvnilesh added a commit to beacloudgenius/mattermost-docker that referenced this pull request Mar 27, 2020
* 'v5.21' of https://github.com/mattermost/mattermost-docker:
  bump mm prod app to 5.21.0
  bump mm prod app to 5.20.2
  web entrypoint: forcefully link existing config (mattermost#454)
nickygerritsen added a commit to Lets-Talk-NL/mattermost-docker that referenced this pull request Jun 29, 2020
* upstream/master: (54 commits)
  bump to 5.24.2
  bump MM to 5.24.1
  bump MM to 5.24.0
  Update Dockerfile (mattermost#476)
  Add ?src=docker-app query parameter to identify download source (mattermost#475)
  bump docker app to 5.23.0
  Fix : certificate signed by unknown authority refs : mattermost/mattermost#13059 (mattermost#474)
  bump app dockerfile to 5.22.3
  Fixing docker-compose build process (mattermost#471)
  bump mm to 5.22.1
  Update Dockerfile (mattermost#467)
  docker-compose: fix DB Docker building error  mattermost#463 related wal-e 1.0.0 and azure (mattermost#464)
  allow uncommenting for team edition (mattermost#433)
  Fix the linking of the nginx configuration file (mattermost#458)
  docker-compose: remove unused ENV variable (mattermost#456)
  bump mm prod app to 5.21.0
  bump mm prod app to 5.20.2
  web entrypoint: forcefully link existing config (mattermost#454)
  Remove deprecated nginx ssl directive (mattermost#451) (mattermost#452)
  bump mm prod app to 5.20.1
  ...
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
2: Dev Review Requires review by a core committer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants