1
0
mirror of https://github.com/bitwarden/server.git synced 2024-11-22 12:15:36 +01:00

script updates

This commit is contained in:
Kyle Spearrin 2017-08-23 16:29:55 -04:00
parent 9af19bfcb8
commit 0733897cea
6 changed files with 10 additions and 4 deletions

View File

@ -27,6 +27,9 @@ https://bitwarden.com, https://github.com/bitwarden
=================================================== ===================================================
" "
docker --version
docker-compose --version
# Setup # Setup
$scriptPath = $MyInvocation.MyCommand.Path $scriptPath = $MyInvocation.MyCommand.Path
@ -95,6 +98,7 @@ elseif($update) {
Download-All-Files Download-All-Files
Invoke-Expression "$scriptsDir\run.ps1 -restart -outputDir $output -dockerDir $dockerDir" Invoke-Expression "$scriptsDir\run.ps1 -restart -outputDir $output -dockerDir $dockerDir"
Invoke-Expression "$scriptsDir\run.ps1 -updatedb -outputDir $output -dockerDir $dockerDir"
} }
elseif($updatedb) { elseif($updatedb) {
Invoke-Expression "$scriptsDir\run.ps1 -updatedb -outputDir $output -dockerDir $dockerDir" Invoke-Expression "$scriptsDir\run.ps1 -updatedb -outputDir $output -dockerDir $dockerDir"

View File

@ -19,6 +19,9 @@ https://bitwarden.com, https://github.com/bitwarden
EOF EOF
docker --version
docker-compose --version
# Setup # Setup
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@ -104,6 +107,7 @@ then
mkdir $DOCKER_DIR mkdir $DOCKER_DIR
downloadAllFiles downloadAllFiles
$SCRIPTS_DIR/run.sh restart $OUTPUT $DOCKER_DIR $SCRIPTS_DIR/run.sh restart $OUTPUT $DOCKER_DIR
$SCRIPTS_DIR/run.sh updatedb $OUTPUT $DOCKER_DIR
elif [ "$1" == "updatedb" ] elif [ "$1" == "updatedb" ]
then then
$SCRIPTS_DIR/run.sh updatedb $OUTPUT $DOCKER_DIR $SCRIPTS_DIR/run.sh updatedb $OUTPUT $DOCKER_DIR

View File

@ -6,7 +6,6 @@ if(!(Test-Path -Path $outputDir )){
New-Item -ItemType directory -Path $outputDir | Out-Null New-Item -ItemType directory -Path $outputDir | Out-Null
} }
docker --version
echo "" echo ""
[string]$letsEncrypt = "n" [string]$letsEncrypt = "n"

View File

@ -1,7 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e set -e
docker --version
echo "" echo ""
OUTPUT_DIR="../." OUTPUT_DIR="../."

View File

@ -29,7 +29,7 @@ function Docker-Prune {
} }
function Update-Lets-Encrypt { function Update-Lets-Encrypt {
if(Test-Path -Path "${outputDir}/letsencrypt") { if(Test-Path -Path "${outputDir}\letsencrypt\live") {
docker run -it --rm --name certbot -p 443:443 -p 80:80 -v $outputDir/letsencrypt:/etc/letsencrypt/ certbot/certbot ` docker run -it --rm --name certbot -p 443:443 -p 80:80 -v $outputDir/letsencrypt:/etc/letsencrypt/ certbot/certbot `
renew --logs-dir /etc/letsencrypt/logs renew --logs-dir /etc/letsencrypt/logs
} }

View File

@ -38,7 +38,7 @@ function dockerPrune() {
} }
function updateLetsEncrypt() { function updateLetsEncrypt() {
if [ -d "${outputDir}/letsencrypt" ] if [ -d "${outputDir}/letsencrypt/live" ]
then then
docker run -it --rm --name certbot -p 443:443 -p 80:80 -v $OUTPUT_DIR/letsencrypt:/etc/letsencrypt/ certbot/certbot \ docker run -it --rm --name certbot -p 443:443 -p 80:80 -v $OUTPUT_DIR/letsencrypt:/etc/letsencrypt/ certbot/certbot \
renew --logs-dir /etc/letsencrypt/logs renew --logs-dir /etc/letsencrypt/logs