| commit | 7a455a7255718cd23d851152b036d31b19095363 | [log] [tgz] |
|---|---|---|
| author | Keith Haddow <haddowk@chromium.org> | Mon May 22 12:58:04 2017 -0700 |
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | Mon Aug 07 22:16:52 2017 +0000 |
| tree | 284285e4d43b1fdbb1e6002353a9a5d599ab8972 | |
| parent | 28531e86cfe131131dd3c7072837fbf7ddd54b0d [diff] |
[moblab] Set CROS_CACHEDIR for apache service. The apache user can not currently share the same gsutil installation as moblab user since the gs code attempts to update the installation and the directory is owned by one or the other users. Ideally the gs code would be updated to handle this case well, however for now make a separate gsutil install just for apache, it is only 20M of disk space. BUG=chromium:723870 TEST=manually on moblab CQ-DEPEND=CL:510014 Change-Id: I1c29a5471136694c628dbe15ddce6782ac25773d Reviewed-on: https://chromium-review.googlesource.com/513395 Commit-Ready: Ilja H. Friedel <ihf@chromium.org> Tested-by: Keith Haddow <haddowk@chromium.org> Reviewed-by: Ilja H. Friedel <ihf@chromium.org> Reviewed-by: Jinsong Mu <jinsong@google.com> Reviewed-by: Keith Haddow <haddowk@chromium.org> (cherry picked from commit 53c5b0e498efff1d76d4fcf5ac3042c75b4867df) Reviewed-on: https://chromium-review.googlesource.com/604482 Commit-Queue: Keith Haddow <haddowk@chromium.org>
diff --git a/project-moblab/chromeos-base/chromeos-bsp-moblab/chromeos-bsp-moblab-0.0.5-r59.ebuild b/project-moblab/chromeos-base/chromeos-bsp-moblab/chromeos-bsp-moblab-0.0.5-r59.ebuild new file mode 120000 index 0000000..6370bce --- /dev/null +++ b/project-moblab/chromeos-base/chromeos-bsp-moblab/chromeos-bsp-moblab-0.0.5-r59.ebuild
@@ -0,0 +1 @@ +chromeos-bsp-moblab-0.0.5.ebuild \ No newline at end of file
diff --git a/project-moblab/chromeos-base/chromeos-bsp-moblab/files/init/moblab-apache-init.conf b/project-moblab/chromeos-base/chromeos-bsp-moblab/files/init/moblab-apache-init.conf index 1977113..d0328e1 100644 --- a/project-moblab/chromeos-base/chromeos-bsp-moblab/files/init/moblab-apache-init.conf +++ b/project-moblab/chromeos-base/chromeos-bsp-moblab/files/init/moblab-apache-init.conf
@@ -9,8 +9,13 @@ stopped moblab-homedir-init and stopped moblab-external-storage-init RESULT=ok) +env CROS_CACHEDIR=/mnt/moblab/cros_cache_apache + pre-start script logger -t "${UPSTART_JOB}" "Starting." + mkdir -p --mode 775 "${CROS_CACHEDIR}" + chown -R apache:apache "${CROS_CACHEDIR}" + APACHE_LOG_DIR=/var/log/apache2 mkdir -p "${APACHE_LOG_DIR}" chown -R apache:apache "${APACHE_LOG_DIR}"
diff --git a/project-moblab/chromeos-base/chromeos-bsp-moblab/files/moblab-apache-settings.conf b/project-moblab/chromeos-base/chromeos-bsp-moblab/files/moblab-apache-settings.conf index 106f6b9..dbea63c 100644 --- a/project-moblab/chromeos-base/chromeos-bsp-moblab/files/moblab-apache-settings.conf +++ b/project-moblab/chromeos-base/chromeos-bsp-moblab/files/moblab-apache-settings.conf
@@ -7,6 +7,7 @@ # in the main configuration. Define MOBLAB_INSTANCE True +PassEnv CROS_CACHEDIR # Protect moblab from securtiy scans as it crashes the device. <IfModule mod_rewrite.c> RewriteEngine On