This repository was archived by the owner on May 31, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 6 files changed +13
-13
lines changed Expand file tree Collapse file tree 6 files changed +13
-13
lines changed Original file line number Diff line number Diff line change 1
- source " $SCRIPT_DIR /bash_fns/detect_os.sh"
1
+ source " $ROOT_DIR /bash_fns/detect_os.sh"
2
2
3
3
function mkuser() {
4
4
local UN=" $1 "
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
3
3
set -e
4
- SCRIPT_DIR= " $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd ) "
4
+ ROOT_DIR= $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && git rev-parse --show-toplevel )
5
5
6
6
cd
7
7
rm -rf bb-dir
@@ -12,4 +12,4 @@ source sandbox/bin/activate
12
12
pip install ' buildbot[bundle]' ==0.9.4
13
13
pip install txrequests
14
14
buildbot create-master master
15
- cp " $SCRIPT_DIR " /bb_master_config/* master/
15
+ cp " $ROOT_DIR " /bb_master_config/* master/
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
3
3
set -e
4
- SCRIPT_DIR= " $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd ) "
4
+ ROOT_DIR= $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && git rev-parse --show-toplevel )
5
5
6
6
if [[ -z $WORKER_BB_SECRETS_FILE ]]; then
7
7
echo " Need WORKER_BB_SECRETS_FILE=[ubuntu|freebsd]_bb_secrets.json defined!"
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
3
3
set -e
4
- SCRIPT_DIR= " $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd ) "
4
+ ROOT_DIR= $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && git rev-parse --show-toplevel )
5
5
6
- source " $SCRIPT_DIR /bash_fns/mkuser.sh"
6
+ source " $ROOT_DIR /bash_fns/mkuser.sh"
7
7
8
8
if [[ -z $WORKER_UNIX_SECRETS_FILE ]]; then
9
9
echo " Need WORKER_UNIX_SECRETS_FILE=[ubuntu|freebsd]_unix_secrets.json defined!"
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
3
- SCRIPT_DIR= " $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd ) "
3
+ ROOT_DIR= $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && git rev-parse --show-toplevel )
4
4
5
- source " $SCRIPT_DIR /.. /bash_fns/detect_os.sh"
6
- source " $SCRIPT_DIR /.. /bash_fns/mkuser.sh"
5
+ source " $ROOT_DIR /bash_fns/detect_os.sh"
6
+ source " $ROOT_DIR /bash_fns/mkuser.sh"
7
7
8
8
UNIX_UN=` jq --raw-output ' .["unix_un"]' ~ /secrets/master_unix_secrets.json`
9
9
UNIX_PW=` jq --raw-output ' .["unix_pw"]' ~ /secrets/master_unix_secrets.json`
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
3
- SCRIPT_DIR= " $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd ) "
3
+ ROOT_DIR= $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && git rev-parse --show-toplevel )
4
4
5
5
MASTER_HOST=` jq --raw-output ' .["master_host"]' ~ /secrets/public.json`
6
6
ADMIN_EMAIL=` jq --raw-output ' .["admin_email"]' ~ /secrets/public.json`
@@ -11,9 +11,9 @@ if [[ -z $MASTER_HOST || -z $ADMIN_EMAIL ]]; then
11
11
fi
12
12
13
13
# Get our configuration files where we want them.
14
- cp " $SCRIPT_DIR /.. /nginx/master.nginx.conf" /etc/nginx/sites-available/master
15
- cp " $SCRIPT_DIR /.. /nginx/master-bootstrap.nginx.conf" /etc/nginx/sites-available/master-bootstrap
16
- cp " $SCRIPT_DIR /.. /nginx/ssl-params.nginx.conf" /etc/nginx/snippets/ssl-params.conf
14
+ cp " $ROOT_DIR /nginx/master.nginx.conf" /etc/nginx/sites-available/master
15
+ cp " $ROOT_DIR /nginx/master-bootstrap.nginx.conf" /etc/nginx/sites-available/master-bootstrap
16
+ cp " $ROOT_DIR /nginx/ssl-params.nginx.conf" /etc/nginx/snippets/ssl-params.conf
17
17
18
18
19
19
# Rewrite the configuration files to use whatever hostname we're configured for.
You can’t perform that action at this time.
0 commit comments