Skip to content
Snippets Groups Projects
Verified Commit daea577f authored by Michal Hrusecky's avatar Michal Hrusecky :mouse: Committed by Josef Schlehofer
Browse files

patches/packages: Fix loading of php 

Files in conf directory has to have extension .conf to be properly
loaded in lighttpd. Changing the extension fixes the problem and makes
php work again on hbl.

Fixes: packages@23f56994 ("lighttpd & turris-webapps: prepare to support upstream OpenWrt lighttpd pkg")
parent dadb6767
Branches
2 merge requests!569Turris OS 6.0 (HBK),!565patches/package/php: Fix loading of php
Pipeline #104425 passed with stages
Stage:
    Stage:
      in 8 minutes and 59 seconds
      Hide whitespace changes
      Inline Side-by-side
      patches/packages/branding/0010-php7-Integrate-php-fpm-into-lighttpd.patch
      + 1
      − 1
      View file @ daea577f
      ......@@ -21,7 +21,7 @@ index a5e863c..1ec1e23 100644
      $(INSTALL_BIN) ./files/php7-fpm.init $(1)/etc/init.d/php7-fpm
      +
      + $(INSTALL_DIR) $(1)/etc/lighttpd/conf.d/
      + $(INSTALL_DATA) ./files/php-fpm.lighttpd $(1)/etc/lighttpd/conf.d/30-php-fpm.load
      + $(INSTALL_DATA) ./files/php-fpm.lighttpd $(1)/etc/lighttpd/conf.d/30-php-fpm.conf
      endef
      define Package/php7-fpm/conffiles
      ......
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment