Skip to content

A
archery
Commit 1c1b499a authored by Taddeus Kroes's avatar Taddeus Kroes
Browse files
Options

HTTPDUSER is now a configurable Makefile variable

parent a678daf6
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
.gitignore
View file @ 1c1b499a
...@@ -6,3 +6,4 @@ vendor/ ...@@ -6,3 +6,4 @@ vendor/
www/js/ www/js/
www/css/ www/css/
config.local.json config.local.json
config.mk
Makefile
View file @ 1c1b499a
...@@ -3,7 +3,8 @@ WWW_DIR := www ...@@ -3,7 +3,8 @@ WWW_DIR := www
LIB_DIR := vendor LIB_DIR := vendor
SCRIPTS := forms scores SCRIPTS := forms scores
STYLES := main STYLES := main
HTTPDUSER := www-data
include config.mk # defines HTTPDUSER
SCRIPTS := $(patsubst %,$(WWW_DIR)/js/%.js,$(SCRIPTS)) SCRIPTS := $(patsubst %,$(WWW_DIR)/js/%.js,$(SCRIPTS))
STYLES := $(patsubst %,$(WWW_DIR)/css/%.css,$(STYLES)) STYLES := $(patsubst %,$(WWW_DIR)/css/%.css,$(STYLES))
...@@ -39,7 +40,7 @@ min: all ...@@ -39,7 +40,7 @@ min: all
$(CACHE_DIR): $(CACHE_DIR):
mkdir $@ mkdir $@
setfacl -R -m u:"$(HTTPDUSER)":rwX $@ setfacl -R -m u:$(HTTPDUSER):rwX -- $@
clean: clean:
rm -f $(SCRIPTS) $(STYLES) *.bak rm -f $(SCRIPTS) $(STYLES) *.bak
......
Markdown is supported
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