openbsd: move to virtualenv

bootstrap-openbsd.sh

@@ -4,14 +4,6 @@
 
 
 pkg_add -z `cat bootstrap/openbsd/pkg-requirements.txt`
 pkg_add -z `cat bootstrap/openbsd/pkg-requirements.txt`
 
 
-# Necessary symlinks
-ln -sf /usr/local/bin/pip2.7 /usr/local/bin/pip
-#ln -sf /usr/local/bin/python2.7 /usr/local/bin/python
-#ln -sf /usr/local/bin/python2.7-2to3 /usr/local/bin/2to3
-#ln -sf /usr/local/bin/python2.7-config /usr/local/bin/python-config
-#ln -sf /usr/local/bin/pydoc2.7  /usr/local/bin/pydoc
-
-
 grep "^cloud:" /etc/passwd > /dev/null
 grep "^cloud:" /etc/passwd > /dev/null
 ret=$?
 ret=$?
 if [ $ret -ne 0 ]
 if [ $ret -ne 0 ]
@@ -32,6 +24,11 @@ then
 	git clone https://git.ik.bme.hu/circle/agent.git agent
 	git clone https://git.ik.bme.hu/circle/agent.git agent
 fi
 fi
 
 
+python2 -m virtualenv /usr/local/virtualenvs/agent
+. /usr/local/virtualenv/agent/bin/activate
+pip install -r /root/requirements.txt
+deactivate
+
 cp bootstrap/openbsd/usr/sbin/mount_circle-userstore /usr/sbin/mount_circle-userstore
 cp bootstrap/openbsd/usr/sbin/mount_circle-userstore /usr/sbin/mount_circle-userstore
 cp bootstrap/openbsd/rc.d/agent /etc/rc.d/agent
 cp bootstrap/openbsd/rc.d/agent /etc/rc.d/agent
 
 

bootstrap/openbsd/pkg-requirements.txt

 git
 git
 python-2.7
 python-2.7
-py-pip
+py-virtualenv
 usmb
 usmb

bootstrap/openbsd/rc.d/agent

@@ -2,8 +2,12 @@
 #
 #
 # $OpenBSD: agent $
 # $OpenBSD: agent $
 
 
-daemon="/usr/local/bin/python2.7 /root/agent/agent.py"
+daemon=". /usr/local/virtualenvs/agent/bin/activate ; python2 /root/agent/agent.py"
+daemon_timeout=180
 
 
 . /etc/rc.d/rc.subr
 . /etc/rc.d/rc.subr
 
 
+rc_bg=YES
+rc_reload=NO
+
 rc_cmd $1
 rc_cmd $1

requirements.txt

+zope.interface==4.6.0
 Twisted==13.2.0
 Twisted==13.2.0
 pyserial==2.7
 pyserial==2.7
 psutil==5.4.8
 psutil==5.4.8