diff options
| author | ivan <ivan> | 2005-04-10 01:13:06 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2005-04-10 01:13:06 +0000 |
| commit | 8d6913fe18cc0a6826ea3cdbb401f3deac0c8243 (patch) | |
| tree | ba535f4b49a28b6b50ff060b3cba9e4a82fda887 | |
| parent | 4bb183f2a62d7a7d38070ff93f24c56f95bf2480 (diff) | |
fix install-apache for bsd make and reverse accidentally-checked-in (again!) RT_ENABLED = 1
| -rw-r--r-- | Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -82,8 +82,8 @@ SELFSERVICE_INSTALL_USER = ivan SELFSERVICE_INSTALL_USERADD = /usr/sbin/useradd #SELFSERVICE_INSTALL_USERADD = "/usr/sbin/pw useradd" -#RT_ENABLED = 0 -RT_ENABLED = 1 +RT_ENABLED = 0 +#RT_ENABLED = 1 RT_DOMAIN = example.com RT_TIMEZONE = US/Pacific; #RT_TIMEZONE = US/Eastern; @@ -191,11 +191,12 @@ install-init: install-apache: [ -d ${APACHE_CONF} ] && \ - install -o root -m 755 htetc/freeside-base.conf ${APACHE_CONF} && \ - ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \ - perl -p -i -e "\ - s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \ - " ${APACHE_CONF}/freeside-*.conf + ( install -o root -m 755 htetc/freeside-base.conf ${APACHE_CONF} && \ + ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \ + perl -p -i -e "\ + s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \ + " ${APACHE_CONF}/freeside-*.conf \ + ) || true install-selfservice: [ -e ~freeside/.ssh/id_dsa.pub ] || su - freeside -c 'ssh-keygen -t dsa' |