[Hejes-devel] [711] rationalized makefiles
hejes-devel at nytud.hu
hejes-devel at nytud.hu
Tue May 7 00:28:39 CEST 2013
Revision: 711
Author: mihaltz
Date: 2013-05-07 00:28:39 +0200 (Tue, 07 May 2013)
Log Message:
-----------
rationalized makefiles
Modified Paths:
--------------
Makefile
trunk/maintenance.log
Added Paths:
-----------
maintenance.log
Removed Paths:
-------------
tags/Makefile
tags/maintenance.log
Modified: Makefile
===================================================================
--- Makefile 2013-05-06 22:19:28 UTC (rev 710)
+++ Makefile 2013-05-06 22:28:39 UTC (rev 711)
@@ -1,15 +1,17 @@
+DIR=/opt/web2py
+APPDIR=helyesiras
+
all:
-
-# This target is used by deploy to check if variable TAG was set
+# This target is used by deploy and create_tag to check if variable TAG was set
# TODO: also check if dir ./$(TAG) exists
check-tag:
- if test "$(TAG)" = "" ; then \
- echo "Error: TAG not set"; \
- exit 1; \
- fi
+ if test "$(TAG)" = "" ; then \
+ echo "Error: TAG not set"; \
+ exit 1; \
+ fi
-# create a new tag = a snapshot copy of trunk in the tags directory
+# create a new tag = a snapshot copy of trunk into the tags directory
# use "make create_tag TAG=XXXXX" to create tag XXXXX
create_tag: check-tag
-mkdir tags/$(TAG)
@@ -18,4 +20,33 @@
svn copy file:///var/svn/helyesiras/trunk/web2py file:///var/svn/helyesiras/tags/$(TAG)/web2py -m "Creating tag $(TAG)"
svn up
# TODO: enable google analytics in menu.py
+# TODO: delete unnecesarry dir from web2py/applications
# TODO: update web2py/applications/helyesiras_webdev/VERSION
+
+
+# Deploy the web2py application from the local ./tags/$(TAG)/ directory. Use e.g. "make deploy TAG=release-1.0" etc. in the command line.
+# The ./tags/$(TAG)/web2py/applications/helyesiras_webdev svn directory will be exported into $(DIR)/applications/$(APPDIR)
+# web2py should already be operational in /opt/web2py
+# All required tools and packages should already be installed (see ./$(TAG)/install/Makefile)
+deploy: check-tag
+ echo Deploying $(TAG)...
+ sudo mkdir -p $(DIR)/applications/$(APPDIR)
+ sudo rm -I -R $(DIR)/applications/$(APPDIR)
+ sudo mkdir $(DIR)/applications/$(APPDIR)
+ sudo svn export --force ./tags/$(TAG)/web2py/applications/helyesiras_webdev $(DIR)/applications/$(APPDIR)
+ sudo svn export --force --depth=files ./tags/$(TAG)/web2py $(DIR)
+ sudo chown -R www-data:www-data $(DIR)/*
+ sudo chmod -R g+w $(DIR)/*
+ python -m compileall $(DIR)/applications/$(APPDIR)
+ hostname >> maintenance.log
+ date >> maintenance.log
+ echo "Deployed $(TAG) to $(DIR)/applications/$(APPDIR)" >> maintenance.log
+
+# Restart webserver
+restart:
+# sudo /etc/init.d/nginx restart
+ sudo service uwsgi restart
+ hostname >> maintenance.log
+ date >> maintenance.log
+ echo "Restarted uwsgi" >> maintenance.log
+
Added: maintenance.log
===================================================================
--- maintenance.log (rev 0)
+++ maintenance.log 2013-05-06 22:28:39 UTC (rev 711)
@@ -0,0 +1,33 @@
+szotar.nytud.hu
+Mon Apr 29 03:25:47 CEST 2013
+Deployed release-1.0 to /opt/web2py/applications/helyesiras
+szotar.nytud.hu
+Mon Apr 29 03:25:57 CEST 2013
+Restarted uwsgi
+szotar.nytud.hu
+Mon Apr 29 09:27:45 CEST 2013
+Deployed release-1.0 to /opt/web2py/applications/helyesiras
+szotar.nytud.hu
+Mon Apr 29 09:30:14 CEST 2013
+Deployed release-1.0 to /opt/web2py/applications/helyesiras
+szotar.nytud.hu
+Mon Apr 29 09:30:34 CEST 2013
+Restarted uwsgi
+szotar.nytud.hu
+Mon Apr 29 09:33:44 CEST 2013
+Deployed release-1.0 to /opt/web2py/applications/helyesiras
+szotar.nytud.hu
+Mon Apr 29 09:41:09 CEST 2013
+Deployed release-1.0 to /opt/web2py/applications/helyesiras
+szotar.nytud.hu
+Mon Apr 29 10:38:17 CEST 2013
+Restarted uwsgi
+szotar.nytud.hu
+Wed May 1 23:59:52 CEST 2013
+Deployed release-1.0.1 to /opt/web2py/applications/helyesiras
+szotar.nytud.hu
+Mon May 6 00:13:18 CEST 2013
+Deployed release-1.0.2 to /opt/web2py/applications/helyesiras
+szotar.nytud.hu
+Mon May 6 00:13:59 CEST 2013
+Restarted uwsgi
Deleted: tags/Makefile
===================================================================
--- tags/Makefile 2013-05-06 22:19:28 UTC (rev 710)
+++ tags/Makefile 2013-05-06 22:28:39 UTC (rev 711)
@@ -1,38 +0,0 @@
-DIR=/opt/web2py
-APPDIR=helyesiras
-
-all:
-
-# This target is used by deploy to check if variable TAG was set
-# TODO: also check if dir ./$(TAG) exists
-check-tag:
- if test "$(TAG)" = "" ; then \
- echo "Error: TAG not set"; \
- exit 1; \
- fi
-
-# Deploy the web2py application from the local ./$(TAG)/ directory. Use e.g. "make deploy TAG=release-1.0" etc. in the command line.
-# The ./$(TAG)/web2py/applications/helyesiras_webdev svn directory will be exported into $(DIR)/applications/$(APPDIR)
-# web2py should already be extracted and operational in /opt/web2py
-# All required tools and packages should already be installed (see ./$(TAG)/install/Makefile)
-deploy: check-tag
- echo Deploying $(TAG)...
- sudo mkdir -p $(DIR)/applications/$(APPDIR)
- sudo rm -I -R $(DIR)/applications/$(APPDIR)
- sudo mkdir $(DIR)/applications/$(APPDIR)
- sudo svn export --force ./$(TAG)/web2py/applications/helyesiras_webdev $(DIR)/applications/$(APPDIR)
- sudo svn export --force --depth=files ./$(TAG)/web2py $(DIR)
- sudo chown -R www-data:www-data $(DIR)/*
- sudo chmod -R g+w $(DIR)/*
- python -m compileall $(DIR)/applications/$(APPDIR)
- hostname >> maintenance.log
- date >> maintenance.log
- echo "Deployed $(TAG) to $(DIR)/applications/$(APPDIR)" >> maintenance.log
-
-# Restart webserver
-restart:
-# sudo /etc/init.d/nginx restart
- sudo service uwsgi restart
- hostname >> maintenance.log
- date >> maintenance.log
- echo "Restarted uwsgi" >> maintenance.log
Deleted: tags/maintenance.log
===================================================================
--- tags/maintenance.log 2013-05-06 22:19:28 UTC (rev 710)
+++ tags/maintenance.log 2013-05-06 22:28:39 UTC (rev 711)
@@ -1,33 +0,0 @@
-szotar.nytud.hu
-Mon Apr 29 03:25:47 CEST 2013
-Deployed release-1.0 to /opt/web2py/applications/helyesiras
-szotar.nytud.hu
-Mon Apr 29 03:25:57 CEST 2013
-Restarted uwsgi
-szotar.nytud.hu
-Mon Apr 29 09:27:45 CEST 2013
-Deployed release-1.0 to /opt/web2py/applications/helyesiras
-szotar.nytud.hu
-Mon Apr 29 09:30:14 CEST 2013
-Deployed release-1.0 to /opt/web2py/applications/helyesiras
-szotar.nytud.hu
-Mon Apr 29 09:30:34 CEST 2013
-Restarted uwsgi
-szotar.nytud.hu
-Mon Apr 29 09:33:44 CEST 2013
-Deployed release-1.0 to /opt/web2py/applications/helyesiras
-szotar.nytud.hu
-Mon Apr 29 09:41:09 CEST 2013
-Deployed release-1.0 to /opt/web2py/applications/helyesiras
-szotar.nytud.hu
-Mon Apr 29 10:38:17 CEST 2013
-Restarted uwsgi
-szotar.nytud.hu
-Wed May 1 23:59:52 CEST 2013
-Deployed release-1.0.1 to /opt/web2py/applications/helyesiras
-szotar.nytud.hu
-Mon May 6 00:13:18 CEST 2013
-Deployed release-1.0.2 to /opt/web2py/applications/helyesiras
-szotar.nytud.hu
-Mon May 6 00:13:59 CEST 2013
-Restarted uwsgi
Modified: trunk/maintenance.log
===================================================================
--- trunk/maintenance.log 2013-05-06 22:19:28 UTC (rev 710)
+++ trunk/maintenance.log 2013-05-06 22:28:39 UTC (rev 711)
@@ -2,3 +2,24 @@
Deployed to /opt/web2py/applications/helyesiras
Sun Apr 28 00:52:09 CEST 2013
Restarted uwsgi
+szotar.nytud.hu
+Mon Apr 29 02:32:17 CEST 2013
+Deployed to /opt/web2py/applications/helyesiras
+szotar.nytud.hu
+Mon Apr 29 02:32:42 CEST 2013
+Restarted uwsgi
+szotar.nytud.hu
+Wed May 1 23:58:18 CEST 2013
+Restarted uwsgi
+szotar.nytud.hu
+Thu May 2 00:02:05 CEST 2013
+Restarted uwsgi
+szotar.nytud.hu
+Thu May 2 00:49:12 CEST 2013
+Restarted uwsgi
+szotar.nytud.hu
+Thu May 2 01:14:15 CEST 2013
+Restarted uwsgi
+szotar.nytud.hu
+Mon May 6 00:07:57 CEST 2013
+Restarted uwsgi
More information about the Hejes-devel
mailing list