Some fixes

DEBIAN/control

@@ -1,11 +1,11 @@
 Package: ahc
-Version: 1.5.1
+Version: 1.5.2
 Section: console
 Priority: optional
 Architecture: all
 Maintainer: GoTLiuM InSPiRiT <[email protected]>
 Homepage: <http://code.google.com/p/apache-host-control/>
-Depends: python-pip, python-mysqldb, python-flup, git-core, make, python-pycurl
+Depends: python-pip, python-mysqldb, python-flup, git-core, make, python-pycurl, python-crypto, python-paramiko, python-virtualenv
 Pre-Depends: python
 Installed-Size: 496.1
 Description: Package for control apache/nginx virtual hosts, mysql/ftp users, bind zones, apache clients certificates on developer/production web-hosts. Tested on Ubuntu/Debian Linux. Published under GNU GPL v.2.

README

@@ -17,8 +17,8 @@ Apache Host Control:
 --------------------------------------------------------------
 $ sudo -i
 # apt-get update && apt-get upgrade -y
-# apt-get install -y python-pip python-mysqldb python-flup git-core make python-pycurl
-# cd /usr/src/ && git clone https://github.com/gotlium/ahc.git
+# apt-get install -y python-pip python-mysqldb python-flup git-core make python-pycurl gcc python-dev
+# cd /usr/src/ && git clone --depth 1 https://github.com/gotlium/ahc.git
 # cd ahc/ && pip install -r requirements.txt && make install
 # cd && ahc -m install -s lamp && ahc -m install -s firewall
 --------------------------------------------------------------

modules/install.py

@@ -31,7 +31,10 @@ def certs(self):
 	def shell(self):
 		home = os.getenv('HOME')
 		shell = os.getenv('SHELL')
-		if shell.find('/bash') != -1:
+		if not shell:
+			configuration = getTemplate('bashrc')
+			filename = '%s/.bashrc' % home
+		elif shell.find('/bash') != -1:
 			configuration = getTemplate('bashrc')
 			filename = '%s/.bashrc' % home
 		elif shell.find('/zsh') != -1:
@@ -559,8 +562,9 @@ def web(self):
 		info_message('Web application was successfully installed.')
 
 	def vpn(self):
-		system_by_code('cp ./templates/ovpn_server.conf /etc/openvpn/')
+		system_by_code('/bin/chmod +x ./templates/ovpn_install.sh')
 		system_by_code('/bin/bash "./templates/ovpn_install.sh"')
+		system_by_code('cp ./templates/ovpn_server.conf /etc/openvpn/')
 		info_message('OpenVPN successfully installed.')
 
 	def dropbox(self):

templates/ovpn_install.sh

@@ -30,6 +30,6 @@ cp ./keys/server.key /etc/openvpn
 cp ./keys/dh1024.pem /etc/openvpn	
 
 # Запускаем OpenVPN
-service openvpn start
+service openvpn start >& /dev/null
 
-exit
+exit 0