diff options
Diffstat (limited to 'meta-openembedded/meta-webserver')
7 files changed, 16 insertions, 18 deletions
diff --git a/meta-openembedded/meta-webserver/README b/meta-openembedded/meta-webserver/README index 7b60630700..7adeff833a 100644 --- a/meta-openembedded/meta-webserver/README +++ b/meta-openembedded/meta-webserver/README @@ -13,14 +13,14 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git subdirectory: meta -branch: master +branch: dunfell revision: HEAD For some recipes, the meta-oe layer is required: URI: git://github.com/openembedded/meta-oe.git subdirectory: meta-oe -branch: master +branch: dunfell revision: HEAD @@ -52,9 +52,9 @@ Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org -with '[meta-webserver]' in the subject. +with '[meta-webserver][dunfell]' in the subject. -Layer maintainer: Derek Straka <derek@asterius.io> +dunfell Maintainer: Armin Kuster <akuster808@gmail.com> License diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb index 5200111520..9b80bbff67 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb @@ -20,9 +20,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ SRC_URI_append_class-target = " \ file://0008-apache2-do-not-use-relative-path-for-gen_test_char.patch \ file://init \ - file://apache2-volatile.conf \ file://apache2.service \ - file://volatiles.04_apache2 \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" @@ -128,16 +126,10 @@ do_install_append_class-target() { -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d/ - install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ - install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/apache2.service ${D}${systemd_unitdir}/system sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/apache2.service sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/apache2.service - elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2 fi rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars* diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf deleted file mode 100644 index ff2c587046..0000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf +++ /dev/null @@ -1,2 +0,0 @@ -d /var/run/apache2 0755 root root - -d /var/log/apache2 0755 root root - diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2.service b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2.service index 9b5548c761..25d43acf8e 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2.service +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2.service @@ -5,6 +5,10 @@ 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-openembedded/meta-webserver/recipes-httpd/apache2/files/init b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/init index 758d133b9e..80a7ebfcb2 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/init +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/init @@ -97,6 +97,11 @@ 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-openembedded/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 deleted file mode 100644 index 922075b1bd..0000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 +++ /dev/null @@ -1,3 +0,0 @@ -# <type> <owner> <group> <mode> <path> <linksource> -d root root 0755 /var/run/apache2 none -d root root 0755 /var/log/apache2 none diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc index 2824c66529..de080a2b01 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -90,7 +90,7 @@ do_install () { install -d ${D}${sysconfdir}/tmpfiles.d echo "d /run/${BPN} - - - -" \ > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf - echo "d /${localstatedir}/log/${BPN} 0755 root root -" \ + echo "d ${localstatedir}/log/${BPN} 0755 root root -" \ >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf fi install -d ${D}${sysconfdir}/${BPN} @@ -139,6 +139,8 @@ do_install () { -e 's,@BASE_BINDIR@,${base_bindir},g' \ ${D}${systemd_unitdir}/system/nginx.service fi + + rm -rf ${D}${localstatedir}/log/ } pkg_postinst_${PN} () { |