projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
quiet warnings
[freeside.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
3b02625
..
1211232
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-2,17
+2,21
@@
DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
#DATASOURCE=DBI:mysql:freeside
DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
#DATASOURCE=DBI:mysql:freeside
-#pgsql on some systems; check /etc/passwd
DB_USER = freeside
DB_PASSWORD=
TEMPLATE = asp
DB_USER = freeside
DB_PASSWORD=
TEMPLATE = asp
-#mason's a bit dodgy stil
+#mason's a bit dodgy stil
l
#TEMPLATE = mason
#TEMPLATE = mason
+ASP_GLOBAL = /usr/local/etc/freeside/asp-global
+
FREESIDE_DOCUMENT_ROOT = /var/www/freeside
FREESIDE_DOCUMENT_ROOT = /var/www/freeside
+HTTPD_RESTART = /etc/init.d/apache restart
+QUEUED_RESTART = /etc/init.d/freeside restart
+
#---
#not changable yet
#---
#not changable yet
@@
-44,7
+48,11
@@
docs:
make ${TEMPLATE}docs
install-docs: docs
make ${TEMPLATE}docs
install-docs: docs
+ [ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
+ [ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true
+ [ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
+ [ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
perl-modules:
cd FS; \
perl-modules:
cd FS; \
@@
-58,32
+66,37
@@
install-perl-modules: perl-modules
install: install-perl-modules install-docs
deploy: install
install: install-perl-modules install-docs
deploy: install
- /etc/init.d/apache restart
+ ${HTTPD_RESTART}
+ ${QUEUED_RESTART}
create-database:
create-database:
- perl -e 'use DBIx::DataSource qw( create_database ); create_database(
\'${DATASOURCE}\', \'${DB_USER}\', \'${DB_PASSWORD}\' ) or die
$DBIx::DataSource::errstr;'
+ perl -e 'use DBIx::DataSource qw( create_database ); create_database(
"${DATASOURCE}", "${DB_USER}", "${DB_PASSWORD}" ) or die $
$DBIx::DataSource::errstr;'
create-config: install-perl-modules
create-config: install-perl-modules
- [ -d ${FREESIDE_CONF} ] || mkdir ${FREESIDE_CONF}
+ [ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S` || true
+ mkdir ${FREESIDE_CONF}
chown freeside ${FREESIDE_CONF}
chown freeside ${FREESIDE_CONF}
+ touch ${FREESIDE_CONF}/secrets
+ chown freeside ${FREESIDE_CONF}/secrets
+ chmod 600 ${FREESIDE_CONF}/secrets
+
echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets
echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets
+ chmod 600 ${FREESIDE_CONF}/secrets
+ chown freeside ${FREESIDE_CONF}/secrets
- [ -d "${FREESIDE_CONF}/conf.${DATASOURCE}" ] \
-
|| mkdir
"${FREESIDE_CONF}/conf.${DATASOURCE}"
- chown
freeside "${FREESIDE_CONF
/conf.${DATASOURCE}"
+ mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
+
cp conf/[a-z]*
"${FREESIDE_CONF}/conf.${DATASOURCE}"
+ chown
-R freeside "${FREESIDE_CONF}
/conf.${DATASOURCE}"
- [ -d "${FREESIDE_CONF}/counters.${DATASOURCE}" ] \
- || mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
- chown freeside "${FREESIDE_CONF/counters.${DATASOURCE}"
+ mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
+ chown freeside "${FREESIDE_CONF}/counters.${DATASOURCE}"
- [ -d "${FREESIDE_CONF}/cache.${DATASOURCE}" ] \
- || mkdir "${FREESIDE_CONF}/cache.${DATASOURCE}"
- chown freeside "${FREESIDE_CONF/cache.${DATASOURCE}"
+ mkdir "${FREESIDE_CONF}/cache.${DATASOURCE}"
+ chown freeside "${FREESIDE_CONF}/cache.${DATASOURCE}"
- [ -d "${FREESIDE_CONF}/export.${DATASOURCE}" ] \
- || mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
- chown freeside "${FREESIDE_CONF/export.${DATASOURCE}"
+ mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
+ chown freeside "${FREESIDE_CONF}/export.${DATASOURCE}"
clean:
rm -rf aspdocs masondocs
clean:
rm -rf aspdocs masondocs