aboutsummaryrefslogtreecommitdiffhomepage
path: root/experimental
diff options
context:
space:
mode:
authorGravatar tfarina <tfarina@chromium.org>2014-10-08 20:05:13 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-10-08 20:05:13 -0700
commitac15bb901c9b8f8b4509a5913899381dfe5ea880 (patch)
treec0278e4f7e9dcfd1b4d64983f245951d3383a74a /experimental
parentac211af359667dd1afcc375e688c3aae46cb13e8 (diff)
webtry: Simply move sys/ directory into setup/.
That seems to make things more tied and that seems to be where we have the same scripts/configs in the perf directory: https://skia.googlesource.com/buildbot/+/master/perf/setup/sys/ That way we keep all files used/related to setting up a new webtry server in one place. BUG=None TEST=None R=humper@google.com Review URL: https://codereview.chromium.org/644513003
Diffstat (limited to 'experimental')
-rw-r--r--experimental/webtry/DESIGN.md4
-rw-r--r--experimental/webtry/setup/sys/webtry_init (renamed from experimental/webtry/sys/webtry_init)0
-rw-r--r--experimental/webtry/setup/sys/webtry_monit (renamed from experimental/webtry/sys/webtry_monit)0
-rw-r--r--experimental/webtry/setup/sys/webtry_schroot (renamed from experimental/webtry/sys/webtry_schroot)0
-rw-r--r--experimental/webtry/setup/sys/webtry_squid (renamed from experimental/webtry/sys/webtry_squid)0
-rwxr-xr-xexperimental/webtry/setup/webtry_setup.sh8
6 files changed, 6 insertions, 6 deletions
diff --git a/experimental/webtry/DESIGN.md b/experimental/webtry/DESIGN.md
index 32b70f021b..6e9642e4c7 100644
--- a/experimental/webtry/DESIGN.md
+++ b/experimental/webtry/DESIGN.md
@@ -251,8 +251,8 @@ Squid
Squid is configured to run on port 80 and run as an accelerator for the actual
Go program which is running on port 8000. The config for the squid proxy is
-held in sys/webtry_squid, which is copied into place during installation and
-squid is kept running via monit.
+held in setup/sys/webtry_squid, which is copied into place during installation
+and squid is kept running via monit.
Workspaces
----------
diff --git a/experimental/webtry/sys/webtry_init b/experimental/webtry/setup/sys/webtry_init
index 359e19e46c..359e19e46c 100644
--- a/experimental/webtry/sys/webtry_init
+++ b/experimental/webtry/setup/sys/webtry_init
diff --git a/experimental/webtry/sys/webtry_monit b/experimental/webtry/setup/sys/webtry_monit
index 906b0a69ac..906b0a69ac 100644
--- a/experimental/webtry/sys/webtry_monit
+++ b/experimental/webtry/setup/sys/webtry_monit
diff --git a/experimental/webtry/sys/webtry_schroot b/experimental/webtry/setup/sys/webtry_schroot
index bbc7f07afc..bbc7f07afc 100644
--- a/experimental/webtry/sys/webtry_schroot
+++ b/experimental/webtry/setup/sys/webtry_schroot
diff --git a/experimental/webtry/sys/webtry_squid b/experimental/webtry/setup/sys/webtry_squid
index 8dd623ba08..8dd623ba08 100644
--- a/experimental/webtry/sys/webtry_squid
+++ b/experimental/webtry/setup/sys/webtry_squid
diff --git a/experimental/webtry/setup/webtry_setup.sh b/experimental/webtry/setup/webtry_setup.sh
index 896656fc48..bcc33975f4 100755
--- a/experimental/webtry/setup/webtry_setup.sh
+++ b/experimental/webtry/setup/webtry_setup.sh
@@ -31,7 +31,7 @@ sudo chmod 777 /home/webtry/inout
sudo chmod 777 /home/webtry/cache
sudo chmod 777 /home/webtry/cache/src
-sudo cp ../sys/webtry_schroot /etc/schroot/chroot.d/webtry
+sudo cp sys/webtry_schroot /etc/schroot/chroot.d/webtry
CHROOT_JAIL=/srv/chroot/webtry_gyp
# Build the chroot environment.
@@ -68,9 +68,9 @@ sudo su - webtry -c /home/webtry/continue_install.sh
banner "Setting up system initialization scripts"
-sudo cp ../sys/webtry_init /etc/init.d/webtry
-sudo cp ../sys/webtry_monit /etc/monit/conf.d/webtry
-sudo cp ../sys/webtry_squid /etc/squid3/squid.conf
+sudo cp sys/webtry_init /etc/init.d/webtry
+sudo cp sys/webtry_monit /etc/monit/conf.d/webtry
+sudo cp sys/webtry_squid /etc/squid3/squid.conf
sudo chmod 744 /etc/init.d/webtry
# Confirm that monit is happy.