From: Guillaume Pellerin Date: Tue, 2 Oct 2018 15:12:40 +0000 (+0200) Subject: Rename local_settings.py -> local_settings.py.sample X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bf25f71b2225ca57c0aa616587fa07633d94f3d0;p=mezzo.git Rename local_settings.py -> local_settings.py.sample --- diff --git a/app/local_settings.py b/app/local_settings.py deleted file mode 100644 index b7944d03..00000000 --- a/app/local_settings.py +++ /dev/null @@ -1,71 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (c) 2016-2017 Ircam -# Copyright (c) 2016-2017 Guillaume Pellerin -# Copyright (c) 2016-2017 Emilie Zawadzki - -# This file is part of mezzanine-organization. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. - -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -import os -from django.utils.translation import ugettext_lazy as _ -from datetime import datetime, date - -DEBUG = True if os.environ.get('DEBUG') == 'True' else False - -# -*- coding: utf-8 -*- -# -# Copyright (c) 2016-2017 Ircam -# Copyright (c) 2016-2017 Guillaume Pellerin -# Copyright (c) 2016-2017 Emilie Zawadzki - -# This file is part of mezzanine-organization. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. - -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -import os -from django.utils.translation import ugettext_lazy as _ -from datetime import datetime, date - -DEBUG = True if os.environ.get('DEBUG') == 'True' else False - -ADMINS = ( - ('Your Name', 'contact@you.org'), -) - -# Make these unique, and don't share it with anybody. -SECRET_KEY = "H7665jhuyUTGuhuUYT6è-ertyezçuàçi'09Iikrpokfàçir" -NEVERCACHE_KEY = "87654RFGhju7665rdfGyuàiPOpkM;?NbGFr'(3(ezrTYuiJK" - -EMAIL_HOST = 'localhost' # please specify your smtp server address -EMAIL_PORT = '25' -SERVER_EMAIL = 'no-reply@no-reply.org' # a no reply address -DEFAULT_FROM_EMAIL = 'default@default.org' # another address, default one -DEFAULT_TO_EMAIL = 'recipient@recipient.org' # default recipient, for your tests -EMAIL_SUBJECT_PREFIX = "[PREFIX]" # prefix title in email -SITE_TITLE = 'Your Site' -SITE_TAGLINE = 'This is a Mezzo site' - diff --git a/app/local_settings.py.sample b/app/local_settings.py.sample new file mode 100644 index 00000000..b7944d03 --- /dev/null +++ b/app/local_settings.py.sample @@ -0,0 +1,71 @@ +# -*- coding: utf-8 -*- +# +# Copyright (c) 2016-2017 Ircam +# Copyright (c) 2016-2017 Guillaume Pellerin +# Copyright (c) 2016-2017 Emilie Zawadzki + +# This file is part of mezzanine-organization. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import os +from django.utils.translation import ugettext_lazy as _ +from datetime import datetime, date + +DEBUG = True if os.environ.get('DEBUG') == 'True' else False + +# -*- coding: utf-8 -*- +# +# Copyright (c) 2016-2017 Ircam +# Copyright (c) 2016-2017 Guillaume Pellerin +# Copyright (c) 2016-2017 Emilie Zawadzki + +# This file is part of mezzanine-organization. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import os +from django.utils.translation import ugettext_lazy as _ +from datetime import datetime, date + +DEBUG = True if os.environ.get('DEBUG') == 'True' else False + +ADMINS = ( + ('Your Name', 'contact@you.org'), +) + +# Make these unique, and don't share it with anybody. +SECRET_KEY = "H7665jhuyUTGuhuUYT6è-ertyezçuàçi'09Iikrpokfàçir" +NEVERCACHE_KEY = "87654RFGhju7665rdfGyuàiPOpkM;?NbGFr'(3(ezrTYuiJK" + +EMAIL_HOST = 'localhost' # please specify your smtp server address +EMAIL_PORT = '25' +SERVER_EMAIL = 'no-reply@no-reply.org' # a no reply address +DEFAULT_FROM_EMAIL = 'default@default.org' # another address, default one +DEFAULT_TO_EMAIL = 'recipient@recipient.org' # default recipient, for your tests +EMAIL_SUBJECT_PREFIX = "[PREFIX]" # prefix title in email +SITE_TITLE = 'Your Site' +SITE_TAGLINE = 'This is a Mezzo site' + diff --git a/lib/grappelli-safe b/lib/grappelli-safe index 66109d3f..1ea336a5 160000 --- a/lib/grappelli-safe +++ b/lib/grappelli-safe @@ -1 +1 @@ -Subproject commit 66109d3f698d57c981bcd35764bfdea8b50d6dc2 +Subproject commit 1ea336a5e767fdbaca08811f859e8a0d93e01023