Permalink
Browse files

Remove some unnecessary playdoh files and add placeholder homepage.

  • Loading branch information...
1 parent b047638 commit ebb5ede478870caba98ce0e9e9c52b673e697d9a @Osmose Osmose committed Nov 8, 2013
Showing with 525 additions and 1,915 deletions.
  1. +373 −25 LICENSE
  2. +9 −12 README.md
  3. +0 −43 Vagrantfile
  4. +0 −28 bin/compile-mo.sh
  5. +0 −20 bin/crontab/crontab.tpl
  6. +0 −42 bin/crontab/gen-crons.py
  7. +0 −69 bin/jenkins.sh
  8. +0 −14 bin/update/commander_settings.py-dist
  9. +0 −139 bin/update/deploy.py
  10. +0 −144 bin/update_site.py
  11. +0 −130 docs/Makefile
  12. +0 −1 docs/_build/.gitignore
  13. 0 docs/_build/.gitkeep
  14. 0 docs/_static/.gitkeep
  15. 0 docs/_templates/.gitkeep
  16. +0 −40 docs/build-github.zsh
  17. +0 −220 docs/conf.py
  18. +0 −30 docs/index.rst
  19. +3 −0 manage.py
  20. 0 media/css/.gitignore
  21. 0 media/img/.gitignore
  22. 0 media/js/.gitignore
  23. +0 −1 migrations/01-noop.sql
  24. 0 migrations/__init__.py
  25. +0 −30 migrations/schematic_settings.py
  26. +0 −15 oneanddone/base/templates/404.html
  27. +0 −15 oneanddone/base/templates/500.html
  28. +20 −0 oneanddone/base/templates/base/base.html
  29. +9 −0 oneanddone/base/templates/base/home.html
  30. +0 −31 oneanddone/base/templates/example_base.html
  31. +11 −0 oneanddone/base/urls.py
  32. +8 −0 oneanddone/base/views.py
  33. 0 oneanddone/examples/__init__.py
  34. +0 −8 oneanddone/examples/models.py
  35. +0 −52 oneanddone/examples/static/examples/css/main.css
  36. +0 −73 oneanddone/examples/static/examples/css/mobile.css
  37. +0 −9 oneanddone/examples/static/examples/js/init.js
  38. +0 −6 oneanddone/examples/static/examples/js/libs/jquery-1.10.2.min.js
  39. +0 −96 oneanddone/examples/static/examples/js/libs/jquery.cookie.js
  40. +0 −36 oneanddone/examples/templates/examples/bleach.html
  41. +0 −43 oneanddone/examples/templates/examples/home.html
  42. +0 −7 oneanddone/examples/templates/examples/mobile/home.html
  43. +0 −12 oneanddone/examples/urls.py
  44. +0 −44 oneanddone/examples/views.py
  45. +0 −31 oneanddone/locale/en_US/LC_MESSAGES/messages.po
  46. +0 −29 oneanddone/locale/fr/LC_MESSAGES/messages.po
  47. +0 −32 oneanddone/locale/templates/LC_MESSAGES/messages.pot
  48. +44 −63 oneanddone/settings/base.py
  49. +35 −30 oneanddone/settings/local.py-dist
  50. +13 −18 oneanddone/urls.py
  51. +0 −30 puppet/files/etc/httpd/conf.d/playdoh.conf
  52. +0 −61 puppet/manifests/classes/apache.pp
  53. +0 −3 puppet/manifests/classes/custom.pp
  54. +0 −25 puppet/manifests/classes/init.pp
  55. +0 −14 puppet/manifests/classes/memcached.pp
  56. +0 −26 puppet/manifests/classes/mysql.pp
  57. +0 −39 puppet/manifests/classes/playdoh.pp
  58. +0 −34 puppet/manifests/classes/python.pp
  59. +0 −29 puppet/manifests/vagrant.pp
  60. +0 −6 settings_test.py
  61. +0 −5 vagrantconfig.yaml
  62. +0 −5 vagrantconfig_local.yaml-dist
View
398 LICENSE

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,23 +1,20 @@
-playdoh
-=======
+oneanddone
+==========
-Mozilla's Playdoh is a web application template based on [Django][django].
-
-Patches are welcome! Feel free to fork and contribute to this project on
-[github][gh-playdoh].
-
-Full [documentation][docs] is available as well.
+The "One and Done" initiative, previously known as "QA Taskboard", is a workflow
+where Mozilla community contributors can pick tasks and work on them - one at a
+time, one day at a time - and feel good about doing them.
+One and Done is written with [Playdoh][playdoh] and [Django][django].
[django]: http://www.djangoproject.com/
-[gh-playdoh]: https://github.com/mozilla/playdoh
-[docs]: http://playdoh.rtfd.org/
+[playdoh]: https://github.com/mozilla/playdoh
License
-------
-This software is licensed under the [New BSD License][BSD]. For more
+This software is licensed under the `Mozilla Public License v. 2.0`_. For more
information, read the file ``LICENSE``.
-[BSD]: http://creativecommons.org/licenses/BSD/
+.. _Mozilla Public License v. 2.0: http://mozilla.org/MPL/2.0/
View
@@ -1,43 +0,0 @@
-require "yaml"
-
-# Load up our vagrant config files -- vagrantconfig.yaml first
-_config = YAML.load(File.open(File.join(File.dirname(__FILE__),
- "vagrantconfig.yaml"), File::RDONLY).read)
-
-# Local-specific/not-git-managed config -- vagrantconfig_local.yaml
-begin
- _config.merge!(YAML.load(File.open(File.join(File.dirname(__FILE__),
- "vagrantconfig_local.yaml"), File::RDONLY).read))
-rescue Errno::ENOENT # No vagrantconfig_local.yaml found -- that's OK; just
- # use the defaults.
-end
-
-CONF = _config
-MOUNT_POINT = '/home/vagrant/project'
-
-Vagrant::Config.run do |config|
- config.vm.box = "lucid32"
- config.vm.box_url = "http://files.vagrantup.com/lucid32.box"
-
- config.vm.forward_port 8000, 8000
-
- # Increase vagrant's patience during hang-y CentOS bootup
- # see: https://github.com/jedi4ever/veewee/issues/14
- config.ssh.max_tries = 50
- config.ssh.timeout = 300
-
- # nfs needs to be explicitly enabled to run.
- if CONF['nfs'] == false or RUBY_PLATFORM =~ /mswin(32|64)/
- config.vm.share_folder("v-root", MOUNT_POINT, ".")
- else
- config.vm.share_folder("v-root", MOUNT_POINT, ".", :nfs => true)
- end
-
- # Add to /etc/hosts: 33.33.33.24 dev.playdoh.org
- config.vm.network :hostonly, "33.33.33.24"
-
- config.vm.provision :puppet do |puppet|
- puppet.manifests_path = "puppet/manifests"
- puppet.manifest_file = "vagrant.pp"
- end
-end
View
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-TARGET=$1
-LOCKFILE="/tmp/compile-mo-${2}.lock"
-
-function usage() {
- echo "syntax:"
- echo " compile-mo.sh locale-dir/ [unique]"
- echo "unique is an optional string that will be used as the name of the lockfile"
- exit 1
-}
-
-# check if file and dir are there
-if [[ ($# -gt 2) || (! -d "$TARGET") ]]; then usage; fi
-
-# check if the lockfile exists
-if [ -e $LOCKFILE ]; then
- echo "$LOCKFILE present, exiting"
- exit 99
-fi
-
-touch $LOCKFILE
-for lang in `find $TARGET -type f -name "*.po"`; do
- dir=`dirname $lang`
- stem=`basename $lang .po`
- msgfmt -o ${dir}/${stem}.mo $lang
-done
-rm $LOCKFILE
View
@@ -1,20 +0,0 @@
-#
-# {{ header }}
-#
-
-# MAILTO=some-email-list
-
-HOME=/tmp
-
-# Every minute!
-* * * * * {{ cron }}
-
-# Every hour.
-42 * * * * {{ django }} cleanup
-
-# Every 2 hours.
-1 */2 * * * {{ cron }} something
-
-# Etc...
-
-MAILTO=root
View
@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-import os
-from optparse import OptionParser
-
-from jinja2 import Template
-
-
-HEADER = '!!AUTO-GENERATED!! Edit bin/crontab/crontab.tpl instead.'
-TEMPLATE = open(os.path.join(os.path.dirname(__file__), 'crontab.tpl')).read()
-
-
-def main():
- parser = OptionParser()
- parser.add_option('-w', '--webapp',
- help='Location of web app (required)')
- parser.add_option('-u', '--user',
- help=('Prefix cron with this user. '
- 'Only define for cron.d style crontabs.'))
- parser.add_option('-p', '--python', default='/usr/bin/python2.6',
- help='Python interpreter to use.')
-
- (opts, args) = parser.parse_args()
-
- if not opts.webapp:
- parser.error('-w must be defined')
-
- ctx = {'django': 'cd %s; %s manage.py' % (opts.webapp, opts.python)}
- ctx['cron'] = '%s cron' % ctx['django']
-
- if opts.user:
- for k, v in ctx.iteritems():
- ctx[k] = '%s %s' % (opts.user, v)
-
- # Needs to stay below the opts.user injection.
- ctx['python'] = opts.python
- ctx['header'] = HEADER
-
- print Template(TEMPLATE).render(**ctx)
-
-
-if __name__ == '__main__':
- main()
View
@@ -1,69 +0,0 @@
-#!/bin/sh
-# This script makes sure that Jenkins can properly run your tests against your
-# codebase.
-set -e
-
-DB_HOST="localhost"
-DB_USER="hudson"
-
-cd $WORKSPACE
-VENV=$WORKSPACE/venv
-
-echo "Starting build on executor $EXECUTOR_NUMBER..."
-
-# Make sure there's no old pyc files around.
-find . -name '*.pyc' -exec rm {} \;
-
-if [ ! -d "$VENV/bin" ]; then
- echo "No virtualenv found. Making one..."
- virtualenv $VENV --no-site-packages
- source $VENV/bin/activate
- pip install --upgrade pip
- pip install coverage
-fi
-
-git submodule sync -q
-git submodule update --init --recursive
-
-if [ ! -d "$WORKSPACE/vendor" ]; then
- echo "No /vendor... crap."
- exit 1
-fi
-
-source $VENV/bin/activate
-pip install -q -r requirements/compiled.txt
-pip install -q -r requirements/dev.txt
-
-cat > settings/local.py <<SETTINGS
-from settings.base import *
-
-ROOT_URLCONF = 'workspace.urls'
-LOG_LEVEL = logging.ERROR
-# Database name has to be set because of sphinx
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.mysql',
- 'HOST': '${DB_HOST}',
- 'NAME': '${JOB_NAME}',
- 'USER': 'hudson',
- 'PASSWORD': '',
- 'OPTIONS': {'init_command': 'SET storage_engine=InnoDB'},
- 'TEST_NAME': 'test_${JOB_NAME}',
- 'TEST_CHARSET': 'utf8',
- 'TEST_COLLATION': 'utf8_general_ci',
- }
-}
-
-INSTALLED_APPS += ('django_nose',)
-CELERY_ALWAYS_EAGER = True
-SETTINGS
-
-echo "Creating database if we need it..."
-echo "CREATE DATABASE IF NOT EXISTS ${JOB_NAME}"|mysql -u $DB_USER -h $DB_HOST
-
-echo "Starting tests..."
-export FORCE_DB=1
-coverage run manage.py test --noinput --with-xunit
-coverage xml $(find apps lib -name '*.py')
-
-echo "FIN"
@@ -1,14 +0,0 @@
-SRC_DIR = ''
-WWW_DIR = ''
-
-CRON_NAME = ''
-
-DEPLOY_SCRIPT = ''
-REMOTE_UPDATE_SCRIPT = ''
-
-WEB_HOSTGROUP = ''
-CELERY_HOSTGROUP = ''
-CELERY_SERVICE = ''
-
-UPDATE_REF = 'origin/master'
-SSH_KEY = None
View
@@ -1,139 +0,0 @@
-"""
-Deploy this project in dev/stage/production.
-
-Requires commander_ which is installed on the systems that need it.
-
-.. _commander: https://github.com/oremj/commander
-"""
-
-import os
-import sys
-
-sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-
-from commander.deploy import task, hostgroups
-import commander_settings as settings
-
-
-@task
-def update_code(ctx, tag):
- """Update the code to a specific git reference (tag/sha/etc)."""
- with ctx.lcd(settings.SRC_DIR):
- ctx.local('git fetch')
- ctx.local('git checkout -f %s' % tag)
- ctx.local('git submodule sync')
- ctx.local('git submodule update --init --recursive')
-
-
-@task
-def update_locales(ctx):
- """Update a locale directory from SVN.
-
- Assumes localizations 1) exist, 2) are in SVN, 3) are in SRC_DIR/locale and
- 4) have a compile-mo.sh script. This should all be pretty standard, but
- change it if you need to.
-
- """
- with ctx.lcd(os.path.join(settings.SRC_DIR, 'locale')):
- ctx.local('svn up')
- ctx.local('./compile-mo.sh .')
-
-
-@task
-def update_assets(ctx):
- with ctx.lcd(settings.SRC_DIR):
- ctx.local("python2.6 manage.py collectstatic --noinput")
- # un-comment if you haven't moved to django-compressor yet
- ## LANG=en_US.UTF-8 is sometimes necessary for the YUICompressor.
- #ctx.local('LANG=en_US.UTF8 python2.6 manage.py compress_assets')
-
-
-@task
-def update_db(ctx):
- """Update the database schema, if necessary.
-
- Uses schematic by default. Change to south if you need to.
-
- """
- with ctx.lcd(settings.SRC_DIR):
- ctx.local('python2.6 ./vendor/src/schematic/schematic migrations')
-
-
-@task
-def install_cron(ctx):
- """Use gen-crons.py method to install new crontab.
-
- Ops will need to adjust this to put it in the right place.
-
- """
- with ctx.lcd(settings.SRC_DIR):
- ctx.local('python2.6 ./bin/crontab/gen-crons.py -w %s -u apache > '
- '/etc/cron.d/.%' % (settings.WWW_DIR, settings.CRON_NAME))
- ctx.local('mv /etc/cron.d/.%s /etc/cron.d/%s' %
- (settings.CRON_NAME, settings.CRON_NAME))
-
-
-@task
-def checkin_changes(ctx):
- """Use the local, IT-written deploy script to check in changes."""
- ctx.local(settings.DEPLOY_SCRIPT)
-
-
-@hostgroups(settings.WEB_HOSTGROUP, remote_kwargs={'ssh_key': settings.SSH_KEY})
-def deploy_app(ctx):
- """Call the remote update script to push changes to webheads."""
- ctx.remote(settings.REMOTE_UPDATE_SCRIPT)
- ctx.remote('/bin/touch %s' % settings.REMOTE_WSGI)
-
-
-@hostgroups(settings.CELERY_HOSTGROUP, remote_kwargs={'ssh_key': settings.SSH_KEY})
-def update_celery(ctx):
- """Update and restart Celery."""
- ctx.remote(settings.REMOTE_UPDATE_SCRIPT)
- ctx.remote('/sbin/service %s restart' % settings.CELERY_SERVICE)
-
-
-@task
-def update_info(ctx):
- """Write info about the current state to a publicly visible file."""
- with ctx.lcd(settings.SRC_DIR):
- ctx.local('date')
- ctx.local('git branch')
- ctx.local('git log -3')
- ctx.local('git status')
- ctx.local('git submodule status')
- ctx.local('python2.6 ./vendor/src/schematic/schematic -v migrations/')
- with ctx.lcd('locale'):
- ctx.local('svn info')
- ctx.local('svn status')
-
- ctx.local('git rev-parse HEAD > media/revision.txt')
-
-
-@task
-def pre_update(ctx, ref=settings.UPDATE_REF):
- """Update code to pick up changes to this file."""
- update_code(ref)
- update_info()
-
-
-@task
-def update(ctx):
- update_assets()
- update_locales()
- update_db()
-
-
-@task
-def deploy(ctx):
- install_cron()
- checkin_changes()
- deploy_app()
- update_celery()
-
-
-@task
-def update_site(ctx, tag):
- """Update the app to prep for deployment."""
- pre_update(tag)
- update()
Oops, something went wrong.

0 comments on commit ebb5ede

Please sign in to comment.