Skip to content

Commit

Permalink
Merge pull request #10 from fedora-infra/feature/simple-salts
Browse files Browse the repository at this point in the history
Feature/simple salts
  • Loading branch information
ralphbean committed Jun 7, 2013
2 parents 1152ed6 + bb5ecf9 commit 9a1e415
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
3 changes: 1 addition & 2 deletions tahrir_api/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,7 @@ def recipient_default(context):


def salt_default(context):
# TODO -- some how we need to get this value from the config. :)
return "beefy"
return str(uuid.uuid4())


def assertion_id_default(context):
Expand Down
3 changes: 0 additions & 3 deletions tahrir_api/scripts/initializedb.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ def main(argv=sys.argv):
config_name = 'config:%s' % path
here_dir = os.getcwd()
settings = appconfig(config_name, name=section, relative_to=here_dir)
import pprint
pprint.pprint(settings)
engine = engine_from_config(settings, 'sqlalchemy.')
DBSession.configure(bind=engine)
DeclarativeBase.metadata.create_all(engine)
Expand Down Expand Up @@ -76,7 +74,6 @@ def main(argv=sys.argv):
assertion = Assertion(
badge=badge,
person=person,
salt=settings['tahrir.salt'],
issued_on=datetime.datetime.now(),
)

Expand Down

0 comments on commit 9a1e415

Please sign in to comment.