Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

patch by joe_e_e to move all files from /etc to /etc/yaws in the inst…

…aller
  • Loading branch information...
commit f9dd6c0e881d6d4748517be74118ac672c6ae17f 1 parent de056eb
@klacke authored
Showing with 10 additions and 10 deletions.
  1. +9 −9 scripts/Makefile
  2. +1 −1  scripts/gentoo/init.d.yaws
View
18 scripts/Makefile
@@ -41,12 +41,12 @@ yaws.conf:
@echo PREFIX is $(PREFIX)
cat yaws.conf.template | \
./Subst %yawsdir% "$(PREFIX)/lib/yaws" | \
- ./Subst %logdir% "$(VARDIR)/log/yaws" | \
+ ./Subst %logdir% "/var/log/yaws" | \
./Subst %vardir% "$(VARDIR)" | \
./Subst %host% `hostname` | \
./Subst %port% 80 | \
./Subst %docroot% "$(VARDIR)/yaws/www" | \
- ./Subst %certdir% "$(ETCDIR)" | \
+ ./Subst %certdir% "$(ETCDIR)/yaws" | \
./Subst %sslport% 443 > yaws.conf
clean:
@@ -58,13 +58,13 @@ install: .install
-rm -rf /tmp/yaws 2> /dev/null
sh ./Install $(PREFIX) $(ERL) \
$(WERL) $(ETCDIR)/ $(VARDIR)/ $(ERLBINDIR)/ $(DESTDIR)
- @cp ../ssl/yaws-cert.pem $(DESTDIR)$(ETCDIR)
- @cp ../ssl/yaws-key.pem $(DESTDIR)$(ETCDIR)
- @if [ -f $(DESTDIR)$(ETCDIR)/yaws.conf ]; \
+ @if [ -f $(DESTDIR)$(ETCDIR)/yaws/yaws.conf ]; \
then echo "Keeping old config file "; \
- cp yaws.conf $(DESTDIR)$(ETCDIR)/yaws.conf.template; \
+ cp yaws.conf $(DESTDIR)$(ETCDIR)/yaws/yaws.conf.template; \
else \
- echo "Installing $(DESTDIR)$(ETCDIR)/yaws.conf"; \
- mkdir -p $(DESTDIR)$(ETCDIR); \
- cp yaws.conf $(DESTDIR)$(ETCDIR)/yaws.conf; \
+ echo "Installing $(DESTDIR)$(ETCDIR)/yaws/yaws.conf"; \
+ mkdir -p $(DESTDIR)$(ETCDIR)/yaws; \
+ cp yaws.conf $(DESTDIR)$(ETCDIR)/yaws/yaws.conf; \
fi
+ @cp ../ssl/yaws-cert.pem $(DESTDIR)$(ETCDIR)/yaws
+ @cp ../ssl/yaws-key.pem $(DESTDIR)$(ETCDIR)/yaws
View
2  scripts/gentoo/init.d.yaws
@@ -14,7 +14,7 @@ yaws=%prefix%/bin/yaws
# By default we run with the default id
# idopts="--id myserverid"
-conf="--conf %etcdir%/yaws.conf"
+conf="--conf %etcdir%yaws/yaws.conf"
opts="start stop reload restart query"
Please sign in to comment.
Something went wrong with that request. Please try again.