diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2020-05-22 10:54:49 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2020-05-28 21:39:22 -0700 |
commit | 1a42752afa43202a26b7185561007a081d9782bf (patch) | |
tree | f5a3d53c51ac516843c1827502b2dbce83233d62 /meta-webserver/recipes-httpd/apache2/files | |
parent | 222ff0f9dc44058cfd959881bc787da09b6d602a (diff) | |
download | meta-openembedded-1a42752afa43202a26b7185561007a081d9782bf.tar.gz |
apache2: create log/run directory via pkg_postinst
The commit e789c3837ca8d65abb4bac29dc2e5c595c8ce05b tries to create
log/run directory in initscript/systemd unit file. This is not a correct
method. We should create them in pkg_postinst.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 6f4d0dbfbc7d5ab8c5781379884f41d30cb6db25)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-httpd/apache2/files')
4 files changed, 5 insertions, 9 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf b/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf new file mode 100644 index 0000000000..ff2c587046 --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf @@ -0,0 +1,2 @@ +d /var/run/apache2 0755 root root - +d /var/log/apache2 0755 root root - diff --git a/meta-webserver/recipes-httpd/apache2/files/apache2.service b/meta-webserver/recipes-httpd/apache2/files/apache2.service index 25d43acf8e..9b5548c761 100644 --- a/meta-webserver/recipes-httpd/apache2/files/apache2.service +++ b/meta-webserver/recipes-httpd/apache2/files/apache2.service @@ -5,10 +5,6 @@ After=network.target remote-fs.target nss-lookup.target [Service] Type=simple Environment=LANG=C -ExecStartPre=mkdir -p /var/log/apache2 -ExecStartPre=mkdir -p /var/run/apache2 -ExecStartPre=chmod -R 0755 /var/log/apache2 -ExecStartPre=chmod -R 0755 /var/run/apache2 ExecStart=@SBINDIR@/httpd -DFOREGROUND -D SSL -D PHP5 -k start ExecStop=@BASE_BINDIR@/kill -WINCH ${MAINPID} KillSignal=SIGCONT diff --git a/meta-webserver/recipes-httpd/apache2/files/init b/meta-webserver/recipes-httpd/apache2/files/init index 80a7ebfcb2..758d133b9e 100644 --- a/meta-webserver/recipes-httpd/apache2/files/init +++ b/meta-webserver/recipes-httpd/apache2/files/init @@ -97,11 +97,6 @@ do_start() return 1 fi - mkdir -p /var/log/apache2 - chmod -R 0755 /var/log/apache2 - mkdir -p /var/run/apache2 - chmod -R 0755 /var/run/apache2 - if apache_conftest ; then $APACHECTL start apache_wait_start $? diff --git a/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 b/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 new file mode 100644 index 0000000000..922075b1bd --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 @@ -0,0 +1,3 @@ +# <type> <owner> <group> <mode> <path> <linksource> +d root root 0755 /var/run/apache2 none +d root root 0755 /var/log/apache2 none |