Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-21 12:05:42 +01:00
Code Issues Projects Releases Wiki Activity

core => server updates

Browse Source
This commit is contained in:
Kyle Spearrin 2019-01-18 22:20:05 -05:00
parent 1a932de925
commit 411e8a67f9
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@ -2,8 +2,8 @@
<img src="https://github.com/bitwarden/brand/blob/master/screenshots/apps-combo-logo.png" alt="Bitwarden" /> <img src="https://github.com/bitwarden/brand/blob/master/screenshots/apps-combo-logo.png" alt="Bitwarden" />
</p> </p>
<p align="center"> <p align="center">
<a href="https://ci.appveyor.com/project/bitwarden/core/branch/master" target="_blank"> <a href="https://ci.appveyor.com/project/bitwarden/server/branch/master" target="_blank">
<img src="https://ci.appveyor.com/api/projects/status/github/bitwarden/core?branch=master&svg=true" alt="appveyor build" /> <img src="https://ci.appveyor.com/api/projects/status/github/bitwarden/server?branch=master&svg=true" alt="appveyor build" />
</a> </a>
<a href="https://hub.docker.com/u/bitwarden/" target="_blank"> <a href="https://hub.docker.com/u/bitwarden/" target="_blank">
<img src="https://img.shields.io/docker/pulls/bitwarden/api.svg" alt="DockerHub" /> <img src="https://img.shields.io/docker/pulls/bitwarden/api.svg" alt="DockerHub" />
@ -15,9 +15,9 @@
------------------- -------------------
The Bitwarden Core project contains the APIs, database, and other infrastructure items needed for the "backend" of all bitwarden client applications. The Bitwarden Server project contains the APIs, database, and other core 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. The server project 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.
## Build/Run ## Build/Run
@ -80,7 +80,7 @@ Full documentation for deploying Bitwarden with Docker can be found in our help
``` ```
curl -s -o bitwarden.sh \ curl -s -o bitwarden.sh \
https://raw.githubusercontent.com/bitwarden/core/master/scripts/bitwarden.sh \ https://raw.githubusercontent.com/bitwarden/server/master/scripts/bitwarden.sh \
&& chmod +x bitwarden.sh && chmod +x bitwarden.sh
./bitwarden.sh install ./bitwarden.sh install
./bitwarden.sh start ./bitwarden.sh start
@ -91,7 +91,7 @@ curl -s -o bitwarden.sh \
``` ```
Invoke-RestMethod -OutFile bitwarden.ps1 ` Invoke-RestMethod -OutFile bitwarden.ps1 `
-Uri https://raw.githubusercontent.com/bitwarden/core/master/scripts/bitwarden.ps1 -Uri https://raw.githubusercontent.com/bitwarden/server/master/scripts/bitwarden.ps1
.\bitwarden.ps1 -install .\bitwarden.ps1 -install
.\bitwarden.ps1 -start .\bitwarden.ps1 -start
.\bitwarden.ps1 -updatedb .\bitwarden.ps1 -updatedb

0
bitwarden-core.sln → bitwarden-server.sln
View File

2
src/Admin/Views/Home/Index.cshtml
View File

@ -89,7 +89,7 @@
</div> </div>
<div class="col-md"> <div class="col-md">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="https://github.com/bitwarden/core/releases" target="_blank">Check for Core updates</a></li> <li><a href="https://github.com/bitwarden/server/releases" target="_blank">Check for Server updates</a></li>
<li><a href="https://github.com/bitwarden/web/releases" target="_blank">Check for Web updates</a></li> <li><a href="https://github.com/bitwarden/web/releases" target="_blank">Check for Web updates</a></li>
<li><a href="https://help.bitwarden.com/article/updating-on-premise/" target="_blank">How do I update?</a></li> <li><a href="https://help.bitwarden.com/article/updating-on-premise/" target="_blank">How do I update?</a></li>
</ul> </ul>

4
util/Setup/Configuration.cs
View File

@ -15,13 +15,13 @@ namespace Bit.Setup
[Description("Auto-generate the `./docker/docker-compose.yml` config file.\n" + [Description("Auto-generate the `./docker/docker-compose.yml` config file.\n" +
"WARNING: Disabling generated config files can break future updates. You will be\n" + "WARNING: Disabling generated config files can break future updates. You will be\n" +
"responsible for maintaining this config file.\n" + "responsible for maintaining this config file.\n" +
"Template: https://github.com/bitwarden/core/blob/master/util/Setup/Templates/DockerCompose.hbs")] "Template: https://github.com/bitwarden/server/blob/master/util/Setup/Templates/DockerCompose.hbs")]
public bool GenerateComposeConfig { get; set; } = true; public bool GenerateComposeConfig { get; set; } = true;
[Description("Auto-generate the `./nginx/default.conf` file.\n" + [Description("Auto-generate the `./nginx/default.conf` file.\n" +
"WARNING: Disabling generated config files can break future updates. You will be\n" + "WARNING: Disabling generated config files can break future updates. You will be\n" +
"responsible for maintaining this config file.\n" + "responsible for maintaining this config file.\n" +
"Template: https://github.com/bitwarden/core/blob/master/util/Setup/Templates/NginxConfig.hbs")] "Template: https://github.com/bitwarden/server/blob/master/util/Setup/Templates/NginxConfig.hbs")]
public bool GenerateNginxConfig { get; set; } = true; public bool GenerateNginxConfig { get; set; } = true;
[Description("Docker compose file port mapping for HTTP. Leave empty to remove the port mapping.\n" + [Description("Docker compose file port mapping for HTTP. Leave empty to remove the port mapping.\n" +