ProtonMail
/
proton-bridge
mirror of https://github.com/ProtonMail/proton-bridge
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

GODT-1751: switch from protonmail.com to proton.me domain

This commit is contained in:
Romain Le Jeune 2022-10-27 13:13:05 +00:00
parent 5a7722fd18
commit 78f9f49a8a
6 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -22,7 +22,7 @@ to start Bridge on startup is enabled by default.
When the main window is closed, Bridge will continue to run in the
background.
More details [on the public website](https://protonmail.com/bridge).
More details [on the public website](https://proton.me/mail/bridge).
## Launchers
Launchers are binaries used to run the Proton Mail Bridge or Import-Export apps.

2
internal/imap/server.go
View File

@ -89,7 +89,7 @@ func newGoIMAPServer(tls *tls.Config, backend backend.Backend, address string, u
serverID := imapid.ID{
imapid.FieldName: "Proton Mail Bridge",
imapid.FieldVendor: "Proton AG",
imapid.FieldSupportURL: "https://protonmail.com/support",
imapid.FieldSupportURL: "https://proton.me/support/mail",
}
server.EnableAuth(sasl.Login, func(conn imapserver.Conn) sasl.Server {

2
internal/updater/host_default.go
View File

@ -20,4 +20,4 @@
package updater
const Host = "https://protonmail.com/download"
const Host = "https://proton.me/download"

30
internal/updater/version.go
View File

@ -38,7 +38,7 @@ type VersionInfo struct {
// Installers are the locations of installer files (for manual installation).
Installers []string
// LandingPage is the address of the app landing page on protonmail.com.
// LandingPage is the address of the app landing page on proton.me
LandingPage string
// ReleaseNotesPage is the address of the page containing the release notes.
@ -54,26 +54,26 @@ type VersionInfo struct {
// {
// "stable": {
// "Version": "2.3.4",
// "Package": "https://protonmail.com/.../bridge_2.3.4_linux.tgz",
// "Package": "https://proton.me/.../bridge_2.3.4_linux.tgz",
// "Installers": [
// "https://protonmail.com/.../something.deb",
// "https://protonmail.com/.../something.rpm",
// "https://protonmail.com/.../PKGBUILD"
// "https://proton.me/.../something.deb",
// "https://proton.me/.../something.rpm",
// "https://proton.me/.../PKGBUILD"
// ],
// "LandingPage": "https://protonmail.com/bridge",
// "ReleaseNotesPage": "https://protonmail.com/.../release_notes.html",
// "LandingPage": "https://proton.me/mail/bridge#download",
// "ReleaseNotesPage": "https://proton.me/download/{ie,bridge}/{stable,early}_releases.html",
// "RolloutProportion": 0.5
// },
// "early": {
// "Version": "2.4.0",
// "Package": "https://protonmail.com/.../bridge_2.4.0_linux.tgz",
// "Package": "https://proton.me/.../bridge_2.4.0_linux.tgz",
// "Installers": [
// "https://protonmail.com/.../something.deb",
// "https://protonmail.com/.../something.rpm",
// "https://protonmail.com/.../PKGBUILD"
// "https://proton.me/.../something.deb",
// "https://proton.me/.../something.rpm",
// "https://proton.me/.../PKGBUILD"
// ],
// "LandingPage": "https://protonmail.com/bridge",
// "ReleaseNotesPage": "https://protonmail.com/.../release_notes.html",
// "LandingPage": "https://proton.me/mail/bridge#download",
// "ReleaseNotesPage": "https://proton.me/download/{ie,bridge}/{stable,early}_releases.html",
// "RolloutProportion": 0.5
// },
// "...": {
@ -84,8 +84,8 @@ type VersionMap map[string]VersionInfo
// getVersionFileURL returns the URL of the version file.
// For example:
// - https://protonmail.com/download/bridge/version_linux.json
// - https://protonmail.com/download/ie/version_linux.json
// - https://proton.me/download/bridge/version_linux.json
// - https://proton.me/download/ie/version_linux.json
func (u *Updater) getVersionFileURL() string {
return fmt.Sprintf("%v/%v/version_%v.json", Host, u.updateURLName, u.platform)
}

6
pkg/pmapi/dialer_pinning.go
View File

@ -33,10 +33,16 @@ var TrustedAPIPins = []string{ //nolint:gochecknoglobals
`pin-sha256="AfMENBVvOS8MnISprtvyPsjKlPooqh8nMB/pvCrpJpw="`, // cold backup
// protonmail.com
// \todo remove when sure no one is using it.
`pin-sha256="8joiNBdqaYiQpKskgtkJsqRxF7zN0C0aqfi8DacknnI="`, // current
`pin-sha256="JMI8yrbc6jB1FYGyyWRLFTmDNgIszrNEMGlgy972e7w="`, // hot backup
`pin-sha256="Iu44zU84EOCZ9vx/vz67/MRVrxF1IO4i4NIa8ETwiIY="`, // cold backup
// proton.me
`pin-sha256="CT56BhOTmj5ZIPgb/xD5mH8rY3BLo/MlhP7oPyJUEDo="`, // current
`pin-sha256="35Dx28/uzN3LeltkCBQ8RHK0tlNSa2kCpCRGNp34Gxc="`, // hot backup
`pin-sha256="qYIukVc63DEITct8sFT7ebIq5qsWmuscaIKeJx+5J5A="`, // col backup
// proxies
`pin-sha256="EU6TS9MO0L/GsDHvVc9D5fChYLNy5JdGYpJw0ccgetM="`, // main
`pin-sha256="iKPIHPnDNqdkvOnTClQ8zQAIKG0XavaPkcEo0LBAABA="`, // backup 1

2
utils/release_notes.sh
View File

@ -19,7 +19,7 @@
# Generate HTML release notes
# hosted at https://protonmail.com/download/{ie,bridge}/{stable,early}_releases.html
# hosted at https://proton.me/download/{ie,bridge}/{stable,early}_releases.html
INFILE=$1
OUTFILE=${INFILE//.md/.html}