Merge branch 'master' of github.com:AllMyChanges/allmychanges.com

Author: svetlyak40wt

allmychanges/settings/default.py

@@ -25,7 +25,7 @@
         'ENGINE': 'django.db.backends.mysql',
         'NAME': os.environ.get('MYSQL_DATABASE', 'allmychanges_' + CURRENT_USER.replace('-', '_')),
         'USER': os.environ.get('MYSQL_USER', 'allmychanges'),
-        'PASSWORD': os.environ.get('MYSQL_PASSWORD', 'allmychanges'),
+        'PASSWORD': os.environ.get('MYSQL_PASSWORD', ''),
         'HOST': os.environ.get('MYSQL_HOST', 'localhost'),
         'PORT': int(os.environ.get('MYSQL_PORT', 3306)),
         'OPTIONS': {'connect_timeout': 3},
@@ -228,14 +228,14 @@ def make_db_aliases():
 # how to get a token:
 # http --auth svetlyak40wt https://api.github.com/authorizations scopes:='["public_repo"]' note="Background allmychanges process." client_id="f1106b299e606f5ae13c" client_secret="xxx"
 # copy client_secret from https://github.com/settings/applications/91994
-GITHUB_TOKEN = '6d7d8605f0d53f29b6e049267e8bcbc80577b27f'
+GITHUB_TOKEN = ''
 SLACK_URLS = {
-    'default': 'https://hooks.slack.com/services/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'
+    'default': ''
 }
-CLOSEIO_KEY = '34c5992096c7f67bd5d22f24e4e87a5837f58af5f326f2cdfda932d4'
-MANDRILL_KEY = 'g3pUEIJTBEd6KGeWkKihgQ'
+CLOSEIO_KEY = ''
+MANDRILL_KEY = ''
 # AllMyChangesBot
-TELEGRAM_BOT_BASE_URL = 'https://api.telegram.org/bot99002009:AAF2epqrBGImWKPANN1GWTnUsI0fxIUpTI0/'
+TELEGRAM_BOT_BASE_URL = ''
 
 
 # these are used to post tweets about new versions

allmychanges/settings/development.py

@@ -16,15 +16,6 @@
 METRIKA_ID = '24627125'
 ANALYTICS_ID = 'UA-49927178-2'
 
-# временно закомментировано, потому что на моем текущем окружении не работает
-# скриншутилка, а надо было прогнать все авдейты на новом механизме даунлоадеров
-#
-# TWITTER_CREDS = ('KuAbS2vX9eM5fOrGJ2KPQm4gH',
-#                  'kBkPXY0UuVmoCxHwY38SVkCL0dh5AJJdlNeJtrUgpQ9rBj6T1b',
-#                  '3260479588-Fjoj5ATZHgepipegP2IxFTL675s2bVpfCzT3G3v',
-#                  '6SeGn2urZzs2ztBuRLD4GdTVuejPx170uAoFEHMXgBfBl')
-
-
 LOG_FILENAME = '/var/log/allmychanges/django.log'
 init_logging(LOG_FILENAME)
 

allmychanges/settings/production.py

@@ -24,14 +24,9 @@
 ANALYTICS_ID = 'UA-49927178-1'
 
 SLACK_URLS = {
-    'default': 'https://hooks.slack.com/services/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',
-    'tasks': 'https://hooks.slack.com/services/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',
 }
 
-TWITTER_CREDS = ('WjfgjgXOwgj2vjUrDYvebI91x',
-                 'iyIGDiLzfFGDr0Kg0yF5x4gAt4zzgi3IjHEpTvoxs6pSeRSgSn',
-                 '3260477051-94dnqE4lm3rx3PLqPhEbjR8SipmRMgcf8s5Pshd',
-                 'di7AAGhtFT2PuCgztxqC3hLP6QcDIIHq2e9flRpUemVSw')
+TWITTER_CREDS = ()
 
 LOG_FILENAME = '/var/log/allmychanges/django.log'
 try: