| 13,7 → 13,7 |
|---|
| aliases_name = "vacation.aliases" |
| --- a/files/Makefile |
| +++ b/files/Makefile |
| @@ -65,26 +65,29 @@ install-aconfig: |
| @@ -65,26 +65,21 @@ install-aconfig: |
| |
| install-motd: |
| $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ |
| 26,20 → 26,19 |
|---|
| + etc/welcome.html ${BROOT}/etc/prayer |
| |
| install: |
| - PREFIX=$(BROOT)$(PREFIX) VAR_PREFIX=$(BROOT)$(VAR_PREFIX) \ |
| - RO_USER=$(RO_USER) RO_GROUP=$(RO_GROUP) \ |
| - RW_USER=$(RW_USER) RW_GROUP=$(RW_GROUP) \ |
| - PUBLIC_DIR=$(PUBLIC_DIR) PRIVATE_DIR=$(PRIVATE_DIR) \ |
| - PUBLIC_FILE=$(PUBLIC_FILE) PRIVATE_FILE=$(PRIVATE_FILE) \ |
| - PUBLIC_EXEC=$(PUBLIC_FILE) PRIVATE_EXEC=$(PRIVATE_EXEC) \ |
| - BIN_DIR=$(BIN_DIR) INSTALL=$(INSTALL) \ |
| - ./install.sh |
| - if [ ! -f $(BROOT)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi |
| + ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BROOT}${PREFIX} |
| + ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BROOT}/etc/prayer |
| + |
| PREFIX=$(BROOT)$(PREFIX) VAR_PREFIX=$(BROOT)$(VAR_PREFIX) \ |
| RO_USER=$(RO_USER) RO_GROUP=$(RO_GROUP) \ |
| RW_USER=$(RW_USER) RW_GROUP=$(RW_GROUP) \ |
| PUBLIC_DIR=$(PUBLIC_DIR) PRIVATE_DIR=$(PRIVATE_DIR) \ |
| PUBLIC_FILE=$(PUBLIC_FILE) PRIVATE_FILE=$(PRIVATE_FILE) \ |
| PUBLIC_EXEC=$(PUBLIC_FILE) PRIVATE_EXEC=$(PRIVATE_EXEC) \ |
| - BIN_DIR=$(BIN_DIR) INSTALL=$(INSTALL) \ |
| + BIN_DIR=$(BROOT)$(BIN_DIR) INSTALL=$(INSTALL) \ |
| ./install.sh |
| - if [ ! -f $(BROOT)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi |
| +# if [ ! -f $(BROOT)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi |
| + tar -c --owner ${RO_USER} --group ${RO_GROUP} icons static | tar -C ${BROOT}${PREFIX} -x |
| if [ ! -f $(BROOT)$(PRAYER_CONFIG_FILE) ]; then $(MAKE) install-config; fi |
| if [ ! -f $(BROOT)$(ACCOUNTD_CONFIG_FILE) ]; then $(MAKE) install-aconfig; fi |
| - if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi |
| 49,86 → 48,6 |
|---|
| |
| redhat-install-init.d: |
| install -D -o root -g root -m 755 \ |
| --- a/files/install.sh |
| +++ b/files/install.sh |
| @@ -4,77 +4,6 @@ |
| |
| PATH=/bin:/sbin/:/usr/bin:/usr/sbin |
| |
| -error=0 |
| - |
| -if [ "x$PREFIX" = "x" ]; then |
| - echo 'PREFIX not defined' |
| - error=1 |
| -fi |
| - |
| -if [ "x$VAR_PREFIX" = "x" ]; then |
| - echo 'VAR_PREFIX not defined' |
| - error=1 |
| -fi |
| - |
| -if [ "x$RO_USER" = "x" ]; then |
| - echo 'RO_USER not defined' |
| - error=1 |
| -fi |
| - |
| -if [ "x$RO_GROUP" = "x" ]; then |
| - echo 'RO_GROUP not defined' |
| - error=1 |
| -fi |
| - |
| -if [ "x$RW_USER" = "x" ]; then |
| - echo 'RW_USER not defined' |
| - error=1 |
| -fi |
| - |
| -if [ "x$RW_GROUP" = "x" ]; then |
| - echo 'RW_GROUP not defined' |
| - error=1 |
| -fi |
| - |
| -if [ "x$PUBLIC_DIR" = "x" ]; then |
| - echo 'PUBLIC_DIR not defined' |
| - error=1 |
| -fi |
| - |
| -if [ "x$PRIVATE_DIR" = "x" ]; then |
| - echo 'PRIVATE_DIR not defined' |
| - error=1 |
| -fi |
| - |
| -if [ "x$BIN_DIR" = "x" ]; then |
| - echo 'BIN_DIR not defined' |
| - error=1 |
| -fi |
| - |
| -if [ $error != 0 ]; then |
| - exit 1 |
| -fi |
| - |
| -if [ ! -d ${VAR_PREFIX} -a `whoami` = "root" ]; then |
| - ${INSTALL} -d -o ${RW_USER} -g ${RW_GROUP} -m ${PRIVATE_DIR} ${VAR_PREFIX} |
| -fi |
| - |
| -if [ ! -d ${PREFIX} ]; then |
| - ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX} |
| -fi |
| - |
| -if [ ! -d ${PREFIX}/etc ]; then |
| - ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc |
| -fi |
| - |
| -if [ ! -d ${PREFIX}/certs ]; then |
| - ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${PREFIX}/certs |
| -fi |
| - |
| -if [ ! -d ${BIN_DIR} ]; then |
| - ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR} |
| -fi |
| - |
| for i in icons static |
| do |
| if [ -d "${PREFIX}/${i}" ]; then |
| --- a/files/etc/prayer.cf.SRC |
| +++ b/files/etc/prayer.cf.SRC |
| @@ -20,7 +20,7 @@ var_prefix = "__VAR_PREFIX__" |