diff --git a/README.md b/README.md index 2f7175568..437c3e901 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- bitwarden + Bitwarden

@@ -15,7 +15,7 @@ ------------------- -The bitwarden Core project contains the APIs, database, and other infrastructure items needed for the "backend" of all bitwarden client applications. +The Bitwarden Core project contains the APIs, database, and other infrastructure items needed for the "backend" of all bitwarden client applications. The core infrastructure is written in C# using .NET Core with ASP.NET Core. The database is written in T-SQL/SQL Server. The codebase can be developed, built, run, and deployed cross-platform on Windows, macOS, and Linux distributions. @@ -65,9 +65,9 @@ visit http://localhost:33657/.well-known/openid-configuration

-You can deploy bitwarden using Docker containers on Windows, macOS, and Linux distributions. Use the provided PowerShell and Bash scripts to get started quickly. Find all of the bitwarden images on [Docker Hub](https://hub.docker.com/u/bitwarden/). +You can deploy Bitwarden using Docker containers on Windows, macOS, and Linux distributions. Use the provided PowerShell and Bash scripts to get started quickly. Find all of the bitwarden images on [Docker Hub](https://hub.docker.com/u/bitwarden/). -Full documentation for deploying bitwarden with Docker can be found in our help center at: https://help.bitwarden.com/article/install-on-premise/ +Full documentation for deploying Bitwarden with Docker can be found in our help center at: https://help.bitwarden.com/article/install-on-premise/ ### Requirements diff --git a/SECURITY.md b/SECURITY.md index 3564ea7b0..ef94f0b49 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,4 +1,4 @@ -bitwarden believes that working with security researchers across the globe is crucial to keeping our +Bitwarden believes that working with security researchers across the globe is crucial to keeping our users safe. If you believe you've found a security issue in our product or service, we encourage you to notify us. We welcome working with you to resolve the issue promptly. Thanks in advance! @@ -16,7 +16,7 @@ notify us. We welcome working with you to resolve the issue promptly. Thanks in # In-scope -- Security issues in any current release of bitwarden. This includes the web vault, browser extension, +- Security issues in any current release of Bitwarden. This includes the web vault, browser extension, and mobile apps (iOS and Android). Product downloads are available at https://bitwarden.com. Source code is available at https://github.com/bitwarden. @@ -24,14 +24,14 @@ notify us. We welcome working with you to resolve the issue promptly. Thanks in The following bug classes are out-of scope: -- Bugs that are already reported on any of bitwarden's issue trackers (https://github.com/bitwarden), +- Bugs that are already reported on any of Bitwarden's issue trackers (https://github.com/bitwarden), or that we already know of. Note that some of our issue tracking is private. - Issues in an upstream software dependency (ex: Xamarin, ASP.NET) which are already reported to the upstream maintainer. - Attacks requiring physical access to a user's device. - Self-XSS -- Issues related to software or protocols not under bitwarden's control -- Vulnerabilities in outdated versions of bitwarden +- Issues related to software or protocols not under Bitwarden's control +- Vulnerabilities in outdated versions of Bitwarden - Missing security best practices that do not directly lead to a vulnerability - Issues that do not have any impact on the general public @@ -39,7 +39,7 @@ While researching, we'd like to ask you to refrain from: - Denial of service - Spamming -- Social engineering (including phishing) of bitwarden staff or contractors -- Any physical attempts against bitwarden property or data centers +- Social engineering (including phishing) of Bitwarden staff or contractors +- Any physical attempts against Bitwarden property or data centers -Thank you for helping keep bitwarden and our users safe! +Thank you for helping keep Bitwarden and our users safe! diff --git a/build.ps1 b/build.ps1 index 11f646742..0d3d3f37a 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,7 +1,7 @@ $dir = Split-Path -Parent $MyInvocation.MyCommand.Path echo $dir -echo "`nBuilding bitwarden" +echo "`nBuilding Bitwarden" echo "==================" & $dir\src\Api\build.ps1 diff --git a/build.sh b/build.sh index f74e48087..d15591623 100644 --- a/build.sh +++ b/build.sh @@ -9,7 +9,7 @@ if [ $# -gt 1 -a "$1" == "push" ] then TAG=$2 - echo "Pushing bitwarden ($TAG)" + echo "Pushing Bitwarden ($TAG)" echo "========================" docker push bitwarden/api:$TAG @@ -24,7 +24,7 @@ elif [ $# -gt 1 -a "$1" == "tag" ] then TAG=$2 - echo "Tagging bitwarden as '$TAG'" + echo "Tagging Bitwarden as '$TAG'" docker tag bitwarden/api bitwarden/api:$TAG docker tag bitwarden/identity bitwarden/identity:$TAG @@ -35,7 +35,7 @@ then docker tag bitwarden/mssql bitwarden/mssql:$TAG docker tag bitwarden/setup bitwarden/setup:$TAG else - echo "Building bitwarden" + echo "Building Bitwarden" echo "==================" chmod u+x $DIR/src/Api/build.sh diff --git a/src/Api/appsettings.json b/src/Api/appsettings.json index f00014a9d..02fc9b24e 100644 --- a/src/Api/appsettings.json +++ b/src/Api/appsettings.json @@ -1,7 +1,7 @@ { "globalSettings": { "selfHosted": false, - "siteName": "bitwarden", + "siteName": "Bitwarden", "projectName": "Api", "stripeApiKey": "SECRET", "baseServiceUri": { diff --git a/src/Billing/appsettings.json b/src/Billing/appsettings.json index b4e8f92f8..06c1ff718 100644 --- a/src/Billing/appsettings.json +++ b/src/Billing/appsettings.json @@ -1,7 +1,7 @@ { "globalSettings": { "selfHosted": false, - "siteName": "bitwarden", + "siteName": "Bitwarden", "projectName": "Billing", "stripeApiKey": "SECRET", "baseServiceUri": { diff --git a/src/Core/MailTemplates/Markdown/OrganizationUserAccepted.md b/src/Core/MailTemplates/Markdown/OrganizationUserAccepted.md index 8c6dd1bde..5810d57f1 100644 --- a/src/Core/MailTemplates/Markdown/OrganizationUserAccepted.md +++ b/src/Core/MailTemplates/Markdown/OrganizationUserAccepted.md @@ -1,5 +1,5 @@ This email is to notify you that {{userEmail}} has accepted your invitation to join {{organizationName}}. -To confirm this user, log into the bitwarden web vault, manage your organization "People" and confirm the user. +To confirm this user, log into the Bitwarden web vault, manage your organization "People" and confirm the user. If you do not wish to confirm this user, you can also remove them from the organization on the same page. diff --git a/src/Core/MailTemplates/Markdown/OrganizationUserConfirmed.md b/src/Core/MailTemplates/Markdown/OrganizationUserConfirmed.md index 4ef73877a..e8c17c399 100644 --- a/src/Core/MailTemplates/Markdown/OrganizationUserConfirmed.md +++ b/src/Core/MailTemplates/Markdown/OrganizationUserConfirmed.md @@ -1,3 +1,3 @@ This email is to notify you that you have been confirmed as a user of {{organizationName}}. -Any collections and logins being shared with you by this organization will now appear in your bitwarden vault. +Any collections and logins being shared with you by this organization will now appear in your Bitwarden vault. diff --git a/src/Core/MailTemplates/Markdown/TwoFactorEmail.md b/src/Core/MailTemplates/Markdown/TwoFactorEmail.md index 5bd8d81e8..40ef52acb 100644 --- a/src/Core/MailTemplates/Markdown/TwoFactorEmail.md +++ b/src/Core/MailTemplates/Markdown/TwoFactorEmail.md @@ -1,3 +1,3 @@ Your two-step verification code is: {{token}} -Use this code to complete logging in with bitwarden. +Use this code to complete logging in with Bitwarden. diff --git a/src/Core/MailTemplates/Markdown/VerifyDelete.md b/src/Core/MailTemplates/Markdown/VerifyDelete.md index b77c8a314..2ad67e2f6 100644 --- a/src/Core/MailTemplates/Markdown/VerifyDelete.md +++ b/src/Core/MailTemplates/Markdown/VerifyDelete.md @@ -1,3 +1,3 @@ -Click the link below to delete your bitwarden account ({{email}}). If you did not request this email to delete your bitwarden account, you can safely ignore it. +Click the link below to delete your Bitwarden account ({{email}}). If you did not request this email to delete your Bitwarden account, you can safely ignore it. <{{url}}> diff --git a/src/Core/MailTemplates/Markdown/VerifyEmail.md b/src/Core/MailTemplates/Markdown/VerifyEmail.md index fa806b4c7..c05e18901 100644 --- a/src/Core/MailTemplates/Markdown/VerifyEmail.md +++ b/src/Core/MailTemplates/Markdown/VerifyEmail.md @@ -1,3 +1,3 @@ -Verify this email address for your bitwarden account by clicking the following link. If you did not request this email to verify a bitwarden account, you can safely ignore it. +Verify this email address for your Bitwarden account by clicking the following link. If you did not request this email to verify a Bitwarden account, you can safely ignore it. <{{url}}> diff --git a/src/Core/MailTemplates/Markdown/Welcome.md b/src/Core/MailTemplates/Markdown/Welcome.md index 08901e76a..24377d9cb 100644 --- a/src/Core/MailTemplates/Markdown/Welcome.md +++ b/src/Core/MailTemplates/Markdown/Welcome.md @@ -1,6 +1,6 @@ -Thank you for creating an account with bitwarden. You may now log in with your new account. +Thank you for creating an account with Bitwarden. You may now log in with your new account. -Did you know that bitwarden is free to sync with all of your devices? Download bitwarden today on: +Did you know that Bitwarden is free to sync with all of your devices? Download Bitwarden today on: Mobile ============ @@ -37,4 +37,4 @@ If you have any questions or problems you can email us from our website at: Thank you! -The bitwarden Team +The Bitwarden Team diff --git a/src/Core/MailTemplates/Razor/OrganizationUserAccepted.cshtml b/src/Core/MailTemplates/Razor/OrganizationUserAccepted.cshtml index 8a6558c8a..fe0ec97c5 100644 --- a/src/Core/MailTemplates/Razor/OrganizationUserAccepted.cshtml +++ b/src/Core/MailTemplates/Razor/OrganizationUserAccepted.cshtml @@ -3,5 +3,5 @@ Layout = "_BasicMailLayout"; }

This email is to notify you that @Model.UserEmail has accepted your invitation to join @Model.OrganizationName.

-

To confirm this user, log into the bitwarden web vault, manage your organization "People, and confirm the user.

+

To confirm this user, log into the Bitwarden web vault, manage your organization "People, and confirm the user.

If you do not wish to confirm this user, you can also remove them from the organization on the same page.

diff --git a/src/Core/MailTemplates/Razor/OrganizationUserAccepted.text.cshtml b/src/Core/MailTemplates/Razor/OrganizationUserAccepted.text.cshtml index 96bffd910..a8953309b 100644 --- a/src/Core/MailTemplates/Razor/OrganizationUserAccepted.text.cshtml +++ b/src/Core/MailTemplates/Razor/OrganizationUserAccepted.text.cshtml @@ -4,6 +4,6 @@ } This email is to notify you that @Raw(Model.UserEmail) has accepted your invitation to join @Raw(Model.OrganizationName). -To confirm this user, log into the bitwarden web vault, manage your organization "People" and confirm the user. +To confirm this user, log into the Bitwarden web vault, manage your organization "People" and confirm the user. If you do not wish to confirm this user, you can also remove them from the organization on the same page. diff --git a/src/Core/MailTemplates/Razor/OrganizationUserConfirmed.cshtml b/src/Core/MailTemplates/Razor/OrganizationUserConfirmed.cshtml index b44ae3d61..c07c910c0 100644 --- a/src/Core/MailTemplates/Razor/OrganizationUserConfirmed.cshtml +++ b/src/Core/MailTemplates/Razor/OrganizationUserConfirmed.cshtml @@ -3,4 +3,4 @@ Layout = "_BasicMailLayout"; }

This email is to notify you that you have been confirmed as a user of @(Model.OrganizationName).

-

Any collections and logins being shared with you by this organization will now appear in your bitwarden vault.

+

Any collections and logins being shared with you by this organization will now appear in your Bitwarden vault.

diff --git a/src/Core/MailTemplates/Razor/OrganizationUserConfirmed.text.cshtml b/src/Core/MailTemplates/Razor/OrganizationUserConfirmed.text.cshtml index 8a1f093bd..8d40563db 100644 --- a/src/Core/MailTemplates/Razor/OrganizationUserConfirmed.text.cshtml +++ b/src/Core/MailTemplates/Razor/OrganizationUserConfirmed.text.cshtml @@ -4,4 +4,4 @@ } This email is to notify you that you have been confirmed as a user of @Raw(Model.OrganizationName). -Any collections and logins being shared with you by this organization will now appear in your bitwarden vault. +Any collections and logins being shared with you by this organization will now appear in your Bitwarden vault. diff --git a/src/Core/MailTemplates/Razor/TwoFactorEmail.cshtml b/src/Core/MailTemplates/Razor/TwoFactorEmail.cshtml index bbd1d5454..63ad08e1d 100644 --- a/src/Core/MailTemplates/Razor/TwoFactorEmail.cshtml +++ b/src/Core/MailTemplates/Razor/TwoFactorEmail.cshtml @@ -6,5 +6,5 @@ Your two-step verification code is: @Model.Token

- Use this code to complete logging in with bitwarden. + Use this code to complete logging in with Bitwarden.

\ No newline at end of file diff --git a/src/Core/MailTemplates/Razor/TwoFactorEmail.text.cshtml b/src/Core/MailTemplates/Razor/TwoFactorEmail.text.cshtml index aee3525c3..87d634822 100644 --- a/src/Core/MailTemplates/Razor/TwoFactorEmail.text.cshtml +++ b/src/Core/MailTemplates/Razor/TwoFactorEmail.text.cshtml @@ -4,4 +4,4 @@ } Your two-step verification code is: @Raw(Model.Token) -Use this code to complete logging in with bitwarden. +Use this code to complete logging in with Bitwarden. diff --git a/src/Core/MailTemplates/Razor/VerifyDelete.cshtml b/src/Core/MailTemplates/Razor/VerifyDelete.cshtml index 9b3b1a7b6..df3ef320c 100644 --- a/src/Core/MailTemplates/Razor/VerifyDelete.cshtml +++ b/src/Core/MailTemplates/Razor/VerifyDelete.cshtml @@ -3,7 +3,7 @@ Layout = "_BasicMailLayout"; }

- Click the link below to delete your bitwarden account (@Model.Email). - If you did not request this email to delete your bitwarden account, you can safely ignore it. + Click the link below to delete your Bitwarden account (@Model.Email). + If you did not request this email to delete your Bitwarden account, you can safely ignore it.

@Model.Url

diff --git a/src/Core/MailTemplates/Razor/VerifyDelete.text.cshtml b/src/Core/MailTemplates/Razor/VerifyDelete.text.cshtml index ae8aa1f09..0661516a1 100644 --- a/src/Core/MailTemplates/Razor/VerifyDelete.text.cshtml +++ b/src/Core/MailTemplates/Razor/VerifyDelete.text.cshtml @@ -2,6 +2,6 @@ @{ Layout = "_BasicMailLayout.text"; } -Click the link below to delete your bitwarden account (@Raw(Model.Email)). If you did not request this email to delete your bitwarden account, you can safely ignore it. +Click the link below to delete your Bitwarden account (@Raw(Model.Email)). If you did not request this email to delete your Bitwarden account, you can safely ignore it. @Raw(Model.Url) diff --git a/src/Core/MailTemplates/Razor/VerifyEmail.cshtml b/src/Core/MailTemplates/Razor/VerifyEmail.cshtml index 691ea8c01..6d317ff4d 100644 --- a/src/Core/MailTemplates/Razor/VerifyEmail.cshtml +++ b/src/Core/MailTemplates/Razor/VerifyEmail.cshtml @@ -3,7 +3,7 @@ Layout = "_BasicMailLayout"; }

- Verify this email address for your bitwarden account by clicking the following link. If you did not request this email to - verify a bitwarden account, you can safely ignore it. + Verify this email address for your Bitwarden account by clicking the following link. If you did not request this email to + verify a Bitwarden account, you can safely ignore it.

@Model.Url

diff --git a/src/Core/MailTemplates/Razor/VerifyEmail.text.cshtml b/src/Core/MailTemplates/Razor/VerifyEmail.text.cshtml index 85e7b1c35..1d5784e74 100644 --- a/src/Core/MailTemplates/Razor/VerifyEmail.text.cshtml +++ b/src/Core/MailTemplates/Razor/VerifyEmail.text.cshtml @@ -2,6 +2,6 @@ @{ Layout = "_BasicMailLayout.text"; } -Verify this email address for your bitwarden account by clicking the following link. If you did not request this email to verify a bitwarden account, you can safely ignore it. +Verify this email address for your Bitwarden account by clicking the following link. If you did not request this email to verify a Bitwarden account, you can safely ignore it. @Raw(Model.Url) diff --git a/src/Core/MailTemplates/Razor/Welcome.cshtml b/src/Core/MailTemplates/Razor/Welcome.cshtml index 799cb122e..ce187a109 100644 --- a/src/Core/MailTemplates/Razor/Welcome.cshtml +++ b/src/Core/MailTemplates/Razor/Welcome.cshtml @@ -8,12 +8,12 @@ @@ -26,13 +26,13 @@
- Thank you for creating an account with bitwarden. You may now log in with your new account. + Thank you for creating an account with Bitwarden. You may now log in with your new account.
- Did you know that bitwarden is free to sync with all of your devices? Download bitwarden today on: + Did you know that Bitwarden is free to sync with all of your devices? Download Bitwarden today on:
@@ -61,22 +61,22 @@
- - Get bitwarden on Google Play + + Get Bitwarden on Google Play - - Get bitwarden for iOS + + Get Bitwarden for iOS
@@ -107,7 +107,7 @@
- + Chrome Extension - + Firefox Extension - + Opera Extension - + Edge Extension
Thank you!
- The bitwarden Team + The Bitwarden Team
diff --git a/src/Core/MailTemplates/Razor/Welcome.text.cshtml b/src/Core/MailTemplates/Razor/Welcome.text.cshtml index a60875319..f7a02243a 100644 --- a/src/Core/MailTemplates/Razor/Welcome.text.cshtml +++ b/src/Core/MailTemplates/Razor/Welcome.text.cshtml @@ -2,9 +2,9 @@ @{ Layout = "_MailLayout.text"; } -Thank you for creating an account with bitwarden. You may now log in with your new account. +Thank you for creating an account with Bitwarden. You may now log in with your new account. -Did you know that bitwarden is free to sync with all of your devices? Download bitwarden today on: +Did you know that Bitwarden is free to sync with all of your devices? Download Bitwarden today on: Mobile ============ @@ -39,4 +39,4 @@ You can also access your vault from any web-enabled device using our web vault a If you have any questions or problems you can email us from our website at: https://bitwarden.com/contact/?utm_source=welcome_email&utm_medium=email Thank you! -The bitwarden Team +The Bitwarden Team diff --git a/src/Core/MailTemplates/Razor/_MailLayout.cshtml b/src/Core/MailTemplates/Razor/_MailLayout.cshtml index b069ab526..e01aa79bc 100644 --- a/src/Core/MailTemplates/Razor/_MailLayout.cshtml +++ b/src/Core/MailTemplates/Razor/_MailLayout.cshtml @@ -3,7 +3,7 @@ - bitwarden + Bitwarden @@ -119,7 +119,7 @@ Twitter Facebook - Google+ + Google+ GitHub diff --git a/src/Core/MailTemplates/Razor/_MailLayout.text.cshtml b/src/Core/MailTemplates/Razor/_MailLayout.text.cshtml index a976f0165..fd4be1dbf 100644 --- a/src/Core/MailTemplates/Razor/_MailLayout.text.cshtml +++ b/src/Core/MailTemplates/Razor/_MailLayout.text.cshtml @@ -5,5 +5,5 @@ - Twitter: https://twitter.com/bitwarden_app - Facebook: https://www.facebook.com/bitwarden/ -- Google+: https://plus.google.com/114869903467947368993 +- Google+: https://plus.google.com/+bitwarden - GitHub: https://github.com/bitwarden \ No newline at end of file diff --git a/src/Identity/appsettings.json b/src/Identity/appsettings.json index 5b468984b..363daaeb6 100644 --- a/src/Identity/appsettings.json +++ b/src/Identity/appsettings.json @@ -1,7 +1,7 @@ { "globalSettings": { "selfHosted": false, - "siteName": "bitwarden", + "siteName": "Bitwarden", "projectName": "Identity", "stripeApiKey": "SECRET", "baseServiceUri": { diff --git a/src/Jobs/appsettings.json b/src/Jobs/appsettings.json index a24d412e6..936e68ded 100644 --- a/src/Jobs/appsettings.json +++ b/src/Jobs/appsettings.json @@ -1,7 +1,7 @@ { "globalSettings": { "selfHosted": false, - "siteName": "bitwarden", + "siteName": "Bitwarden", "projectName": "Jobs", "stripeApiKey": "SECRET", "baseServiceUri": { diff --git a/src/Scim/appsettings.json b/src/Scim/appsettings.json index b4e8f92f8..06c1ff718 100644 --- a/src/Scim/appsettings.json +++ b/src/Scim/appsettings.json @@ -1,7 +1,7 @@ { "globalSettings": { "selfHosted": false, - "siteName": "bitwarden", + "siteName": "Bitwarden", "projectName": "Billing", "stripeApiKey": "SECRET", "baseServiceUri": { diff --git a/util/Function/Download.cs b/util/Function/Download.cs index d84b8c22d..93da45c00 100644 --- a/util/Function/Download.cs +++ b/util/Function/Download.cs @@ -20,7 +20,7 @@ namespace Bit.Function const string DesktopWindowsAppxFileName = "Bitwarden-{0}.appx"; const string DesktopWindowsAppx32FileName = "Bitwarden-{0}-ia32.appx"; const string DesktopWindowsStoreUrl = "https://www.microsoft.com/en-us/store/b/home"; - const string DesktopWindowsChocoUrl = "https://chocolatey.org/search?q=bitwarden"; + const string DesktopWindowsChocoUrl = "https://chocolatey.org/packages/bitwarden"; const string DesktopMacOsDmgFileName = "Bitwarden-{0}.dmg"; const string DesktopMacOsPkgFileName = "Bitwarden-{0}.pkg"; diff --git a/util/Function/NewHelpdeskTicket.cs b/util/Function/NewHelpdeskTicket.cs index 8934f2408..02a8b0d09 100644 --- a/util/Function/NewHelpdeskTicket.cs +++ b/util/Function/NewHelpdeskTicket.cs @@ -83,7 +83,7 @@ namespace Bit.Function status = 2, priority = 2, source = 1, - subject = "bitwarden.com Website Contact", + subject = "Bitwarden.com Website Contact", description = FormatMessage(message) }); @@ -103,7 +103,7 @@ namespace Bit.Function var fromAddress = new MailAddress(email, name, Encoding.UTF8); var mailMessage = new MailMessage(fromAddress, new MailAddress("bitwardencomsupport@bitwarden.freshdesk.com")) { - Subject = "bitwarden.com Website Contact", + Subject = "Bitwarden.com Website Contact", Body = FormatMessage(message), IsBodyHtml = true }; diff --git a/util/Mail/wwwroot/index.html b/util/Mail/wwwroot/index.html index 9402874c2..dd23797b3 100644 --- a/util/Mail/wwwroot/index.html +++ b/util/Mail/wwwroot/index.html @@ -2,7 +2,7 @@ - bitwarden Mail Templates + Bitwarden Mail Templates
    diff --git a/util/Mail/wwwroot/templates/announcement.html b/util/Mail/wwwroot/templates/announcement.html index 75c3c881a..aa590a30d 100644 --- a/util/Mail/wwwroot/templates/announcement.html +++ b/util/Mail/wwwroot/templates/announcement.html @@ -49,7 +49,7 @@ Thank you!
    - The bitwarden Team + The Bitwarden Team @@ -69,7 +69,7 @@ Twitter Facebook - Google+ + Google+ diff --git a/util/Mail/wwwroot/templates/welcome.html b/util/Mail/wwwroot/templates/welcome.html index d08d994e4..41bd67605 100644 --- a/util/Mail/wwwroot/templates/welcome.html +++ b/util/Mail/wwwroot/templates/welcome.html @@ -25,12 +25,12 @@ @@ -43,12 +43,12 @@
    - Thank you for creating an account with bitwarden. You may now log in with your new account. + Thank you for creating an account with Bitwarden. You may now log in with your new account.
    - Did you know that bitwarden is free to sync with all of your devices? Download bitwarden today on: + Did you know that Bitwarden is free to sync with all of your devices? Download Bitwarden today on:
    @@ -78,22 +78,22 @@
    - + Get bitwarden on Google Play - + Get bitwarden for iOS
    @@ -124,7 +124,7 @@
    - + Chrome Extension - + Firefox Extension - + Opera Extension - + Edge Extension
    Thank you!
    - The bitwarden Team + The Bitwarden Team
    @@ -143,7 +143,7 @@ Twitter Facebook - Google+ + Google+ GitHub diff --git a/util/Setup/CertBuilder.cs b/util/Setup/CertBuilder.cs index 47e38b8bc..a2c82bc36 100644 --- a/util/Setup/CertBuilder.cs +++ b/util/Setup/CertBuilder.cs @@ -29,7 +29,7 @@ namespace Bit.Setup Helpers.Exec("openssl req -x509 -newkey rsa:4096 -sha256 -nodes -days 365 " + $"-keyout /bitwarden/ssl/self/{Domain}/private.key " + $"-out /bitwarden/ssl/self/{Domain}/certificate.crt " + - $"-subj \"/C=US/ST=New York/L=New York/O=8bit Solutions LLC/OU=bitwarden/CN={Domain}\""); + $"-subj \"/C=US/ST=New York/L=New York/O=8bit Solutions LLC/OU=Bitwarden/CN={Domain}\""); } if(LetsEncrypt) @@ -41,7 +41,7 @@ namespace Bit.Setup Console.WriteLine("Generating key for IdentityServer."); Directory.CreateDirectory("/bitwarden/identity/"); Helpers.Exec("openssl req -x509 -newkey rsa:4096 -sha256 -nodes -keyout identity.key " + - "-out identity.crt -subj \"/CN=bitwarden IdentityServer\" -days 10950"); + "-out identity.crt -subj \"/CN=Bitwarden IdentityServer\" -days 10950"); Helpers.Exec("openssl pkcs12 -export -out /bitwarden/identity/identity.pfx -inkey identity.key " + $"-in identity.crt -certfile identity.crt -passout pass:{IdentityCertPassword}"); diff --git a/util/Setup/Program.cs b/util/Setup/Program.cs index 6db2f6831..dc4cc495b 100644 --- a/util/Setup/Program.cs +++ b/util/Setup/Program.cs @@ -212,7 +212,7 @@ namespace Bit.Setup private static void PrintEnvironment() { var vaultUrl = Helpers.GetValueFronEnvFile("global", "globalSettings__baseServiceUri__vault"); - Console.WriteLine("\nbitwarden is up and running!"); + Console.WriteLine("\nBitwarden is up and running!"); Console.WriteLine("==================================================="); Console.WriteLine("\nvisit {0}", vaultUrl); Console.Write("to update, run "); @@ -313,7 +313,7 @@ namespace Bit.Setup } catch { - Console.WriteLine("Unable to validate installation id. Problem contacting bitwarden server."); + Console.WriteLine("Unable to validate installation id. Problem contacting Bitwarden server."); return false; } }