@@ -14,7 +14,7 @@ cmsitem_table = Table("cms", meta.metadata, Column("site_id", Integer, default=1), Column("children_count", Integer,default=1), Column("created", DateTime,default=datetime.now), - Column("last_update",DateTime,default=datetime.now,onupdate=datetime.now()), + Column("last_update",DateTime,default=datetime.now,onupdate=datetime.now), Column("item_type", DBString(20), default='cms'), Column("title", DBString(120), nullable=False), Column("key", DBString(150), nullable=False), demisauce/trunk/demisauce/model/cms.py @@ -60,7 +60,7 @@ service_table = Table("service", meta.metadata, Column("app_id", Integer, ForeignKey('app.id')), Column("owner_id", Integer, ForeignKey('person.id')), Column("created", DateTime,default=datetime.now), - Column("last_update",DateTime,default=datetime.now,onupdate=datetime.now()), + Column("last_update",DateTime,default=datetime.now,onupdate=datetime.now), Column("cache_time", Integer, default=900), Column("list_public", Boolean, default=False), Column("format", DBString(30)), demisauce/trunk/demisauce/model/service.py @@ -43,7 +43,7 @@ Demisauce can be installed following these `instructions ], url='http://demisauce.googlecode.com', install_requires=["Pylons==0.9.6.2","Routes==1.7.3", 'sqlalchemy==0.5.6', - 'demisaucepy>=0.0.2','tempita','simplejson', + 'demisaucepy>=0.0.2','tempita','simplejson',"memcache", 'webhelpers==0.6'], packages=find_packages(exclude=['ez_setup']), include_package_data=True, demisauce/trunk/setup.py @@ -50,7 +50,7 @@ Demisauce can be installed with `Easy Install author_email='', url='http://github.com/araddon/demisauce', download_url='http://demisauce.googlecode.com/files/demisaucepy-0.1.1.tar.gz', - install_requires=["elementtree>=1.1","nose>=0.10.4"], + install_requires=["elementtree>=1.1","nose>=0.10.4","memcache"], license='MIT', packages=find_packages(exclude=['ez_setup', 'examples']), include_package_data=True, demisaucepy/trunk/setup.py @@ -64,8 +64,6 @@ vm107 = _server(base_config,{"desc":"VMware 107 Demisauce Server","host" : "192 ec2prod = _server(base_config,{"desc":"EC2 Prod 1","host" : "aws.amazon.com","mailhostname" : 'smtp.demisauce.org'}) imac = _server(base_config,{"desc":"iMac Desktop Dev", "os": "osx", "host" : "localhost","user":"aaron"}) -#print "\nvm106 = %s" % vm106 -#print "\nvm107 = %s" % vm107 """{'mailhostname': 'localhost', 'show': None, 'key_filename': None, 'reject_unknown_hosts': False, 'project_name': 'demisauce', 'roledefs': {}, 'redis_version': 'redis-1.02', @@ -78,29 +76,8 @@ imac = _server(base_config,{"desc":"iMac Desktop Dev", "os": "osx", "host" : "l 'host': '192.168.0.106', 'port': '22', 'user': 'demisauce', 'path': '/home/demisauce', 'password': 'xyz', 'rcfile': '/Users/aaron/.fabricrc', 'desc': 'VMware 106 Demisauce Server', 'roles': [], 'local_path': '/Users/aaron/Dropbox/demisauce', 'use_shell': True, - 'hosts': ['192.168.0.106'], 'mysql_root_pwd': 'demisauce', 'warn_only': False, 'os': 'ubuntu9.04'} """ - -def _vm106(): - "The dev VM linux machine" - env.hosts = ['192.168.0.106'] - env.user = 'demisauce' - env.path = '/home/demisauce' - env.os = 'ubuntu9.04' - env.type = 'vm' - env.environment = 'dev' - env.mailhostname = 'demisauce106.localhost' - -def _vm107(): - "The dev VM linux machine" - env.hosts = ['192.168.0.107'] - env.user = 'demisauce' - env.path = '/home/demisauce' - env.os = 'ubuntu9.04' - env.type = 'vm' - env.environment = 'prod' - env.mailhostname = 'demisauce107.localhost' - - + 'hosts': ['192.168.0.106'], 'mysql_root_pwd': 'demisauce', 'warn_only': False, 'os': 'ubuntu9.04'} +""" # ===== Private Tasks ========== def _nginx_release(): sudo("/etc/init.d/nginx stop") @@ -200,13 +177,13 @@ def _linux_base(): First you have installed base ubuntu and ssh, wget: sudo apt-get -y update; sudo apt-get -y install openssh-server wget """ - sudo("apt-get -y update; apt-get -y install wget unzip cron rsync python-setuptools python-dev") + sudo("apt-get -y update; apt-get -y install wget unzip cron rsync python-setuptools python-dev python-virtualenv") sudo("apt-get -y install build-essential git-core; apt-get -y update") sudo("easy_install -U pip") def _demisauce_pre_reqs(): """install python-mysqldb, gdata, boto(amazon api's)""" - sudo('apt-get -y install python-mysqldb') + sudo('apt-get -y install python-mysqldb python-memcache') sudo('easy_install http://gdata-python-client.googlecode.com/files/gdata.py-1.1.1.tar.gz') sudo('easy_install http://boto.googlecode.com/files/boto-1.8d.tar.gz') @@ -230,6 +207,11 @@ def release(userdbpwd): sudo("/etc/init.d/nginx restart") +def simple_push(): + """Simple release, just web sync""" + rsync_project('/home/demisauce/ds/current_web/',local_dir='%(local_path)s/demisauce/trunk' % env) + restart_web() + def db_backup_apply(): """Apply a backup """ require("mysql_root_pwd") @@ -276,3 +258,6 @@ def build_step2(rootmysqlpwd="demisauce",userdbpwd="demisauce"): _demisauce_pre_reqs() + + + install/fabfile.py @@ -48,13 +48,13 @@ isRunning(){ fi } start() { - log_daemon_msg "Starting $DESCRIPTION" isRunning isAlive=$? if [ "${isAlive}" -eq $TRUE ]; then # ok, im using cron to keep running, so ignore this return 0 else + log_daemon_msg "Starting $DESCRIPTION" paster serve --daemon --pid-file=$PIDFILE production.ini start chmod 400 $DEMISAUCE_HOME/$PIDFILE log_end_msg $SCRIPT_OK install/install_initd.sh 21dfe1c1cfd66fffd7a65f9e971796b257bc4746 Aaron Raddon araddon@yahoo.com http://github.com/araddon/demisauce/commit/e1b237d642f0bbebf341f8cba85dce9f427e7b59 e1b237d642f0bbebf341f8cba85dce9f427e7b59 2009-10-28T23:48:11-07:00 2009-10-28T23:48:11-07:00 bug not writing correct date, adding virtual env to installer 5c0f37d650890928d9819ec9b9da96965cf6e4b7 Aaron Raddon araddon@yahoo.com