Deactivating handling of puppet modules

diff --git a/deploy-old.py b/deploy-old.py
new file mode 100755 (executable)
index 0000000..4e60321
--- /dev/null
+++ b/deploy-old.py
@@ -0,0 +1,219 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# This script should be used as a web hook for git
+#
+# It receives push events as JSON-Data and synchronizes
+# the local repository 
+#
+# Author: Ivan Prikhodko <ivan.prikhodko@pixelpark.com>
+# Last change: 2014-10-01 15:40
+
+import sys
+import time
+import json
+import re
+import os
+import subprocess
+import smtplib
+
+
+import traceback
+
+DEBUG = True
+LOGFILE = '/tmp/gitdeploy.txt'
+
+# only for debug:
+# PREFIX = '/www/sites/puppetmaster.pixelpark.com/gitdeploy/cgi-bin' 
+# PREFIX_HIERA = '/www/sites/puppetmaster.pixelpark.com/gitdeploy/cgi-bin/puppet-hiera'
+
+
+# correct prefix
+PREFIX = '/www/data/puppet-environment'
+PREFIX_HIERA = '/www/data/puppet-hiera'
+
+ESPECIALCHARS = "Received special characters in module name"
+ENOBRANCHDIR = "Branch folder does not exist"
+ENOMODSDIR = "Modules folder does not exist"
+
+EGITACCESSDENIED = "Access to remote repository was denied"
+
+#ignore_projects = ['nova', 'cinder', 'heat', 'neutron', 'glance', 
+#              'ceilometer', 'horizon']
+
+ignore_projects = []
+
+DEFAULT_EMAIL = 'ivan.prikhodko@pixelpark.com'
+
+# Correct:
+mailTo = []
+mailCC = ['webmaster@pixelpark.com', DEFAULT_EMAIL] 
+#mailBCC = [DEFAULT_EMAIL] 
+
+def sendEmail(text, moduleName='undefined'):
+       """
+       Send text as EMail 
+       """
+       global mailTo
+        sender = DEFAULT_EMAIL
+       if not mailTo:
+               mailTo = [DEFAULT_EMAIL]
+       receivers = mailTo + mailCC
+        #receivers = ['ivan.prikhodko@pixelpark.com','philipp.dallig@pixelpark.com']
+
+        message = """From: Puppetmaster <ivan.prikhodko@pixelpark.com>
+To: %s
+CC: %s
+Subject: puppetmaster gitdeploy error
+
+Error while processing %s module:
+%s.
+""" % (", ".join(mailTo), ", ".join(mailCC), moduleName, text)
+
+       # only for debug:
+       #fl = open('/tmp/gitdeploy.txt', 'a')
+       #fl.write("sender: %s receivers: %s, message: %s\n\n" % (sender, receivers, message))
+       #fl.close()
+
+        smtpObj = smtplib.SMTP('smtp.pixelpark.com', 25)
+        smtpObj.starttls()
+        smtpObj.sendmail(sender, receivers, message)
+
+
+def index():
+       """
+       Parses JSON-Data and updates local git repository
+       """
+
+
+       timeformat = '%Y-%m-%dT%H:%M:%S'
+       data = sys.stdin.read();
+       myJsonData = json.loads(data)
+       ref = myJsonData[u'ref'].split('/')[-1]
+       name = myJsonData[u'repository'][u'name']
+       if name in ignore_projects:
+               return "ignoring project %s from icehouse-branch" % name
+
+
+       # get committer's e-mail
+       committers = []
+       for commit in myJsonData['commits']:
+               timestampString = commit['timestamp'].split('+')[0]
+               timestamp = time.strptime(timestampString, timeformat)
+               emailAddress = commit['author']['email']        
+               committers.append((timestamp, emailAddress))
+
+       committers.sort()
+       if committers:
+               mailTo.append(committers[-1][1])
+
+
+       #url = myJsonData[u'repository'][u'url']
+       if name == 'hiera':
+               url = 'git@git.pixelpark.com:puppet/hiera.git'
+       else:
+               url = 'git@git.pixelpark.com:puppet/%s.git' % name
+       branch = 'undefined'
+
+       if DEBUG:
+               fl = open(LOGFILE, 'a')
+               fl.write("ref=%s name=%s url=%s PWD=%s\n" % (ref, name, url, os.getcwd()))
+               fl.close()
+
+       if re.match("^dev.*", ref):
+               branch = 'development'
+       elif ref == 'master':
+               # sendEmail('test message 1, please ignore', name)
+               branch = 'test'
+
+       # check if json parameters contain special characters
+       if re.search(r"[^a-zA-Z0-9_\-]", name):
+                       sendEmail(ESPECIALCHARS, name)
+                       return ESPECIALCHARS
+                       
+               
+       if name != 'hiera':
+               os.chdir(PREFIX)
+               # test branch folder 
+               if not os.access(branch, os.F_OK):
+                       sendEmail(ENOBRANCHDIR, name)
+                       return ENOBRANCHDIR
+       
+               # test folder 'modules' 
+               modulesSubfolder = os.path.join(branch, 'modules')
+               if not os.access(modulesSubfolder, os.F_OK):
+                       sendEmail(ENOMODSDIR, name)
+                       return ENOMODSDIR
+
+               os.chdir(modulesSubfolder)
+               if not os.access(name, os.F_OK):
+                       # os.system('sudo git clone %s' % url)
+                       #mdOutput = os.popen('sudo git clone %s 2>&1' % url)
+                       if branch == 'test':
+                               gitProcess = subprocess.Popen(['sudo', 'git', 'clone', '-b', 'master', url],
+                                       stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                               if DEBUG:
+                                       fl = open(LOGFILE, 'a')
+                                       fl.write("\n%s\n" % "cloning master, not default branch")
+                                       fl.close()
+
+
+                       else:
+                               gitProcess = subprocess.Popen(['sudo', 'git', 'clone', url],
+                                                        stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                       out, err = gitProcess.communicate()
+                       if err:
+                               if DEBUG:
+                                       fl = open(LOGFILE, 'a')
+                                       fl.write("\n%s\n" % err)
+                                       fl.close()
+
+
+                       if 'Access denied' in err:
+                               sendEmail(EGITACCESSDENIED, name)
+                               return EGITACCESSDENIED
+               else:
+                       os.chdir(name)
+                       #os.system('sudo git pull')
+                       gitProcess = subprocess.Popen(['sudo', 'git', 'pull'],
+                                                         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                        out, err = gitProcess.communicate()
+                        if err:
+                                if DEBUG:
+                                        fl = open(LOGFILE, 'a')
+                                        fl.write("\n%s\n" % err)
+                                        fl.close()
+
+                        if 'Access denied' in err:
+                                sendEmail(EGITACCESSDENIED, name)
+                                return EGITACCESSDENIED                        
+
+       else:
+               # project hiera is a special case
+               if not os.access(PREFIX_HIERA, os.F_OK):
+                       sendEmail(ENOMODSDIR, name)
+                       return ENOMODSDIR
+               os.chdir(PREFIX_HIERA)
+               if not os.access(name, os.F_OK):
+                       os.system('sudo -n git clone %s' % url)
+               else:
+                       os.chdir(name)
+                       os.system('sudo -n git pull')
+
+       return data
+
+print "Content-Type: text/plain;charset=utf-8"
+print
+
+print "Python CGI läuft"
+try:
+       res = index()
+except:
+       res = traceback.format_exc()
+
+if DEBUG:
+       fl = open(LOGFILE, 'a')
+       fl.write("\n" + time.asctime() + "\n")
+       fl.write(res + "\n\n")
+       fl.close()
+

diff --git a/deploy.py b/deploy.py
deleted file mode 100755 (executable)
index 4e60321..0000000
--- a/deploy.py
+++ /dev/null
@@ -1,219 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# This script should be used as a web hook for git
-#
-# It receives push events as JSON-Data and synchronizes
-# the local repository 
-#
-# Author: Ivan Prikhodko <ivan.prikhodko@pixelpark.com>
-# Last change: 2014-10-01 15:40
-
-import sys
-import time
-import json
-import re
-import os
-import subprocess
-import smtplib
-
-
-import traceback
-
-DEBUG = True
-LOGFILE = '/tmp/gitdeploy.txt'
-
-# only for debug:
-# PREFIX = '/www/sites/puppetmaster.pixelpark.com/gitdeploy/cgi-bin' 
-# PREFIX_HIERA = '/www/sites/puppetmaster.pixelpark.com/gitdeploy/cgi-bin/puppet-hiera'
-
-
-# correct prefix
-PREFIX = '/www/data/puppet-environment'
-PREFIX_HIERA = '/www/data/puppet-hiera'
-
-ESPECIALCHARS = "Received special characters in module name"
-ENOBRANCHDIR = "Branch folder does not exist"
-ENOMODSDIR = "Modules folder does not exist"
-
-EGITACCESSDENIED = "Access to remote repository was denied"
-
-#ignore_projects = ['nova', 'cinder', 'heat', 'neutron', 'glance', 
-#              'ceilometer', 'horizon']
-
-ignore_projects = []
-
-DEFAULT_EMAIL = 'ivan.prikhodko@pixelpark.com'
-
-# Correct:
-mailTo = []
-mailCC = ['webmaster@pixelpark.com', DEFAULT_EMAIL] 
-#mailBCC = [DEFAULT_EMAIL] 
-
-def sendEmail(text, moduleName='undefined'):
-       """
-       Send text as EMail 
-       """
-       global mailTo
-        sender = DEFAULT_EMAIL
-       if not mailTo:
-               mailTo = [DEFAULT_EMAIL]
-       receivers = mailTo + mailCC
-        #receivers = ['ivan.prikhodko@pixelpark.com','philipp.dallig@pixelpark.com']
-
-        message = """From: Puppetmaster <ivan.prikhodko@pixelpark.com>
-To: %s
-CC: %s
-Subject: puppetmaster gitdeploy error
-
-Error while processing %s module:
-%s.
-""" % (", ".join(mailTo), ", ".join(mailCC), moduleName, text)
-
-       # only for debug:
-       #fl = open('/tmp/gitdeploy.txt', 'a')
-       #fl.write("sender: %s receivers: %s, message: %s\n\n" % (sender, receivers, message))
-       #fl.close()
-
-        smtpObj = smtplib.SMTP('smtp.pixelpark.com', 25)
-        smtpObj.starttls()
-        smtpObj.sendmail(sender, receivers, message)
-
-
-def index():
-       """
-       Parses JSON-Data and updates local git repository
-       """
-
-
-       timeformat = '%Y-%m-%dT%H:%M:%S'
-       data = sys.stdin.read();
-       myJsonData = json.loads(data)
-       ref = myJsonData[u'ref'].split('/')[-1]
-       name = myJsonData[u'repository'][u'name']
-       if name in ignore_projects:
-               return "ignoring project %s from icehouse-branch" % name
-
-
-       # get committer's e-mail
-       committers = []
-       for commit in myJsonData['commits']:
-               timestampString = commit['timestamp'].split('+')[0]
-               timestamp = time.strptime(timestampString, timeformat)
-               emailAddress = commit['author']['email']        
-               committers.append((timestamp, emailAddress))
-
-       committers.sort()
-       if committers:
-               mailTo.append(committers[-1][1])
-
-
-       #url = myJsonData[u'repository'][u'url']
-       if name == 'hiera':
-               url = 'git@git.pixelpark.com:puppet/hiera.git'
-       else:
-               url = 'git@git.pixelpark.com:puppet/%s.git' % name
-       branch = 'undefined'
-
-       if DEBUG:
-               fl = open(LOGFILE, 'a')
-               fl.write("ref=%s name=%s url=%s PWD=%s\n" % (ref, name, url, os.getcwd()))
-               fl.close()
-
-       if re.match("^dev.*", ref):
-               branch = 'development'
-       elif ref == 'master':
-               # sendEmail('test message 1, please ignore', name)
-               branch = 'test'
-
-       # check if json parameters contain special characters
-       if re.search(r"[^a-zA-Z0-9_\-]", name):
-                       sendEmail(ESPECIALCHARS, name)
-                       return ESPECIALCHARS
-                       
-               
-       if name != 'hiera':
-               os.chdir(PREFIX)
-               # test branch folder 
-               if not os.access(branch, os.F_OK):
-                       sendEmail(ENOBRANCHDIR, name)
-                       return ENOBRANCHDIR
-       
-               # test folder 'modules' 
-               modulesSubfolder = os.path.join(branch, 'modules')
-               if not os.access(modulesSubfolder, os.F_OK):
-                       sendEmail(ENOMODSDIR, name)
-                       return ENOMODSDIR
-
-               os.chdir(modulesSubfolder)
-               if not os.access(name, os.F_OK):
-                       # os.system('sudo git clone %s' % url)
-                       #mdOutput = os.popen('sudo git clone %s 2>&1' % url)
-                       if branch == 'test':
-                               gitProcess = subprocess.Popen(['sudo', 'git', 'clone', '-b', 'master', url],
-                                       stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                               if DEBUG:
-                                       fl = open(LOGFILE, 'a')
-                                       fl.write("\n%s\n" % "cloning master, not default branch")
-                                       fl.close()
-
-
-                       else:
-                               gitProcess = subprocess.Popen(['sudo', 'git', 'clone', url],
-                                                        stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                       out, err = gitProcess.communicate()
-                       if err:
-                               if DEBUG:
-                                       fl = open(LOGFILE, 'a')
-                                       fl.write("\n%s\n" % err)
-                                       fl.close()
-
-
-                       if 'Access denied' in err:
-                               sendEmail(EGITACCESSDENIED, name)
-                               return EGITACCESSDENIED
-               else:
-                       os.chdir(name)
-                       #os.system('sudo git pull')
-                       gitProcess = subprocess.Popen(['sudo', 'git', 'pull'],
-                                                         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                        out, err = gitProcess.communicate()
-                        if err:
-                                if DEBUG:
-                                        fl = open(LOGFILE, 'a')
-                                        fl.write("\n%s\n" % err)
-                                        fl.close()
-
-                        if 'Access denied' in err:
-                                sendEmail(EGITACCESSDENIED, name)
-                                return EGITACCESSDENIED                        
-
-       else:
-               # project hiera is a special case
-               if not os.access(PREFIX_HIERA, os.F_OK):
-                       sendEmail(ENOMODSDIR, name)
-                       return ENOMODSDIR
-               os.chdir(PREFIX_HIERA)
-               if not os.access(name, os.F_OK):
-                       os.system('sudo -n git clone %s' % url)
-               else:
-                       os.chdir(name)
-                       os.system('sudo -n git pull')
-
-       return data
-
-print "Content-Type: text/plain;charset=utf-8"
-print
-
-print "Python CGI läuft"
-try:
-       res = index()
-except:
-       res = traceback.format_exc()
-
-if DEBUG:
-       fl = open(LOGFILE, 'a')
-       fl.write("\n" + time.asctime() + "\n")
-       fl.write(res + "\n\n")
-       fl.close()
-