diff --git a/Repositories/jainslee_private/Makefile b/Repositories/jainslee_private/Makefile index e21987e..97b06af 100755 --- a/Repositories/jainslee_private/Makefile +++ b/Repositories/jainslee_private/Makefile @@ -9,7 +9,8 @@ ARCHIVE_CONFIG:=$(EPRINTS)/archives/$(ARCHIVE_NAME).xml -.PHONY: deploy restart +.PHONY: deploy generate_apacheconf import_subjects generate_static \ + generate_abstracts generate_views restart_apache index stats deploy: @@ -23,8 +24,8 @@ @-grep --quiet "$(ARCHIVE_NAME)/cfg/subjects" .del-rsync-output && $(MAKE) import_subjects @-grep --quiet "\\(otago_eprints/cfg/static/\\)\\|\\(\\.xml\\)" .del-rsync-output && $(MAKE) generate_static @-grep --quiet "\\(\\.pm\\)\\|\\(\\.xml\\)\|\($(ARCHIVE_NAME)/cfg/subjects\)" .del-rsync-output && $(MAKE) generate_views - @-grep --quiet "$(ARCHIVE_NAME)/cfg/ArchiveRenderConfig.pm" .del-rsync-output && $(MAKE) generate_abstracts - @-grep --quiet "\\(\\.pm\\)\\|\\(\\.xml\\)" .del-rsync-output && $(MAKE) restart_apache + @-grep --quiet "\\($(ARCHIVE_NAME)/cfg/ArchiveRenderConfig.pm\\)\\|\\(\\.xml\\)" .del-rsync-output && $(MAKE) generate_abstracts + @-grep --quiet "\\(\\.conf\\)\\|\\(\\.pm\\)\\|\\(\\.xml\\)" .del-rsync-output && $(MAKE) restart_apache @rm -f .del-rsync-output @@ -38,11 +39,24 @@ restart_apache: @announce "Waiting for Apache to shut down..." - @sudo /usr/sbin/apachectl stop - @while [ -f /var/run/httpd.pid ]; do echo > /dev/null; done +# @sudo /usr/sbin/apachectl stop +# @while [ -f /var/run/httpd.pid ]; do echo > /dev/null; done + @sudo /sw/sbin/apachectl stop + @sleep 7 @announce "Waiting for Apache to start up..." - @sudo /usr/sbin/apachectl start - @while [ ! -f /var/run/httpd.pid ]; do echo > /dev/null; done +# @sudo /usr/sbin/apachectl start +# @while [ ! -f /var/run/httpd.pid ]; do echo > /dev/null; done + @sudo /sw/sbin/apachectl start + @while [ ! -f /sw/var/apache2/logs/httpd.pid ]; do echo > /dev/null; done + +index: + @announce "Rebuilding indexes..." + @sudo -u www $(BINDIR)/indexer start --once --notdaemon + +stats: + @announce "Generating statistics..." + @sudo -u www php $(EPRINTS)/ePrintsStats/scripts/eprints-usage.php + @sudo -u www perl $(EPRINTS)/ePrintsStats/scripts/add_country.pl debug: