Skip to content
Browse files

Updating the vbox management of snapshots

git-svn-id: http://svn.lsd.ufcg.edu.br/repos/ourgrid/projects/ourgrid/trunk@3939 92191d1a-1055-4c69-b98d-3dc93dc5eb86
  • Loading branch information...
1 parent f570054 commit 13a15fd448877fd519bbd1be918a7a66f966b2d5 marcosancj committed
Showing with 69 additions and 70 deletions.
  1. +4 −4 deployer/deb/broker/control/postinst
  2. +36 −24 peer.properties
  3. +2 −2 pom.xml
  4. +27 −40 worker.properties
View
8 deployer/deb/broker/control/postinst
@@ -78,8 +78,8 @@ function createAndConfigureProperties() {
chmod -R 777 /etc/ourgrid/broker
-PROPERTIES_FILE=/home/$SUDO_USER/.broker/broker.properties
-CERTIFICATE_FILE=/home/$SUDO_USER/.broker/certification/mycertificate/mycertificate.cer
+PROPERTIES_FILE=$HOME/.broker/broker.properties
+CERTIFICATE_FILE=$HOME/.broker/certification/mycertificate/mycertificate.cer
if [ -e $PROPERTIES_FILE ]; then
su $SUDO_USER -c "sed -ri 's/commune.xmpp.username=(.*)/commune.xmpp.username=$USERNAME/g' $3 $PROPERTIES_FILE"
@@ -87,9 +87,9 @@ if [ -e $PROPERTIES_FILE ]; then
su $SUDO_USER -c "sed -ri 's/commune.xmpp.servername=(.*)/commune.xmpp.servername=$SERVERNAME/g' $3 $PROPERTIES_FILE"
su $SUDO_USER -c "sed -ri 's/broker.peer.address=(.*)/broker.peer.address=$PEERADDRESS/g' $PROPERTIES_FILE"
else
- su $SUDO_USER -c "mkdir -p /home/$SUDO_USER/.broker"
+ su $SUDO_USER -c "mkdir -p $HOME/.broker"
if [ ! -e $CERTIFICATE_FILE ]; then
- su $SUDO_USER -c "mkdir -p /home/$SUDO_USER/.broker/certification/mycertificate"
+ su $SUDO_USER -c "mkdir -p $HOME/.broker/certification/mycertificate"
fi
createAndConfigureProperties
su $SUDO_USER -c "sed -i 's/{username}/'$USERNAME'/g' $PROPERTIES_FILE"
View
60 peer.properties
@@ -1,29 +1,41 @@
-#Mon Jul 21 16:28:01 GMT-03:00 2008
-
-peer.accounting.cpuunit=1
+#Tue Jun 26 11:21:17 BRT 2012
peer.longitude=0
-peer.description=My peer description
+peer.label=rei.lsd.ufcg.edu.br
+peer.register.ondemand=no
+peer.description=no description available
+commune.filetransfer.max.simultaneous=10
peer.joincommunity=no
+commune.usemonitor=no
+peer.ds.overloaded.retrydelay=300
+peer.ds.network=lsd-ds@xmpp.ourgrid.org
+commune.filetransfer.notify.progress=no
+peer.rankingfile=/local/marcosancj/work/Ourgrid/rankings.dat
+commune.certification.file.mycertificatefilepath=/local/marcosancj/work/Ourgrid/certification/mycertificate/mycertificate.cer
+commune.fd.wan.detectiontime=120
+confdir=/local/marcosancj/work/Ourgrid
+commune.xmpp.password=xmpp-password
+commune.fd.localhost.heartbeatdelay=10
+commune.xmpp.username=rei
+peer.accounting.cpuunit=1
+peer.usevomsauth=no
+commune.fd.localhost.detectiontime=40
+commune.xmpp.serversecureport=5223
peer.latitude=0
+commune.xmpp.servername=xmpp.ourgrid.org
+peer.ds.requestsize=500
peer.interval.saving=1800000
-peer.accounting.dataunit=1
-peer.repeatrequest=120
-peer.label=
-peer.default.sdf=
-peer.email=
-
-peer.ds.network=lsd-ds@xmpp.ourgrid.org
peer.ds.update=60
-
-confdir=.
-
-commune.publickey=
-commune.privatekey=
-
-commune.xmpp.username=
-commune.xmpp.password=
-commune.xmpp.servername=
-
-#Authentication
-peer.requesting.cacertificate.path=certification/mycertificate
-peer.receiving.cacertificate.path=certification/mycertificate
+commune.fd.wan.heartbeatdelay=30
+commune.fd.lan.detectiontime=60
+commune.xmpp.checkresource=yes
+sync.logger=no
+peer.vomsurl=voms.eela.ufrj.br\:8443/voms/oper.vo.eu-eela.eu
+peer.voluntary=yes
+peer.email=no e-mail available
+peer.repeatrequest=120
+commune.privatekey=MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJO85ginPUmqMYfvKQHqDZSM/p1JWpdj29qAlyW/wPtg4B+F8i7mN/AWQGNpoyJ/Yw72ZbsxgdHicrtr8GvJvkqocnUFh4aXvw0Uj2lJo6XVqR97Rxh650cbxEYrEBGpWOxywP++jhGs3HFDEKkQgwCkc1M85PYsbXf4+40NXhRtAgMBAAECgYBUjruCnGXhsb2jtejcpZ+cNI7Oa1ukZo1BJHReMMA9oJbms/2HhlDh43p6681pQ0vpFnHnkFBjVp6gUwlKSC/XIJ41IEobJLdpufZl7wQN/3h5xZ23ZHiWRrnRvSzhFjlUDPbNhI1Sxv1tn1tKI/FAmuyP6NWerHJ+cTQAia6eqQJBAMdcfLQpyans4weDl4B89hwZyOfjeVIpSUwM8+AuKDocT47fSjRZQvGHnj7SWmzkobQHqPnRSo/BOlDIDz0wkqMCQQC9tdnAtkKYRkd4ZnDEiaBKT8pWkdGs5gxW3+0WPrpc44T5UcwQ9sY2U8vfV5ADRCSEao3D/N110VyoVaiNcz2vAkEAl/CpKjZe+B8OuH9WTBrxB2GveOwpXrEQp+GHTOhgyEkjaWRMjbEqECKoPIDdYfiuNSNRaXRVO1KtOzv+QUhvuQJAUG9pKx9b7wplRTRR/dLIhpl8FeZvu1oywybgdD0WcUn6WGeJGWw4MFKpL0IGCox62zX+c6mkEE87dRgUhhzlewI/ETD08XWt5sMwJvS9c05/MDvsHCo8riwybSdV9bXbUkSH+6je3aIdCcgvy/ttrc4rWPnYTBoudJ+TWubUhrwb
+commune.fd.lan.heartbeatdelay=15
+peer.accounting.dataunit=1
+commune.xmpp.serverport=5222
+commune.filetransfer.timeout=120
+commune.publickey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCTvOYIpz1JqjGH7ykB6g2UjP6dSVqXY9vagJclv8D7YOAfhfIu5jfwFkBjaaMif2MO9mW7MYHR4nK7a/Bryb5KqHJ1BYeGl78NFI9pSaOl1akfe0cYeudHG8RGKxARqVjscsD/vo4RrNxxQxCpEIMApHNTPOT2LG13+PuNDV4UbQIDAQAB
View
4 pom.xml
@@ -10,7 +10,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <application.subversion.date>20120614</application.subversion.date>
+ <application.subversion.date>20120703</application.subversion.date>
<application.subversion>0.0.${application.subversion.date}</application.subversion>
<application.version>4.3.0</application.version>
<application.deb.version>${application.version}-build-${application.subversion.date}</application.deb.version>
@@ -1972,7 +1972,7 @@
<dependency>
<groupId>org.ourgrid.ourvirt</groupId>
<artifactId>ourvirt</artifactId>
- <version>1.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.swinglabs</groupId>
View
67 worker.properties
@@ -1,45 +1,32 @@
-#An example of worker properties file
-commune.filetransfer.max.simultaneous=10
-vm.os.version=Ubuntu
-worker.executor=GENERIC
-worker.spec.reporttime=120
-commune.usemonitor=no
-worker.storagedir=/tmp/.brokerstorage
-vm.hypervisor.type=VBOX
-commune.filetransfer.notify.progress=no
-commune.certification.file.mycertificatefilepath=./certification/mycertificate/mycertificate.cer
-worker.spec.report=no
-commune.fd.wan.detectiontime=300
-confdir=.
-vm.disk.path=./image-server.vdi
-vm.name=owvbox_1
-commune.xmpp.password=12345
-commune.fd.localhost.heartbeatdelay=5
+#Tue Jun 26 11:23:30 BRT 2012
+commune.privatekey=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJFb7EHHPM2tOuTo93rTjO8iMnm2TjW8PK+SLrhvuE3bmi28F4Ew9wlucNVD1raodLqHhHFKreHWfsne40XQ5U+nX7KCCBAyZQuU5fFWYVW8xSK+ob2r08ulHft+178VqBhu34B8DRT8Ycbs10Af0dT+VIy0Rm3+7swotNZPnmgtAgMBAAECgYBUFd/CYVWsCPSTrKxUkgHp51dZjvsJHJ3iVmbObFoqN8mlgTP7mO6etxNwWvDe8u2rZW9Y9gFGLgVkE5pXLbMoEe8+NkfERRBvOzuRaZqGfzZaqi0F+zsVdg0kuE1f8cQmWTnwhJVXCnBfI1HxVciOu32RFxyb2RdAi2Rdc6/jZQJBAOD+sW+I5lw3glSIT4cFExMMgA0jWPqM7XtOwcZgyzh6U9EwOwmHvM/CEikLrCop39dLmoNIN5x4pSeMkrdPT3cCQQClY9wM92k5l63d2IhnxK7NQvAB952woM1CsF4L/pCGUZcRFeuPJzHVjx4g7WXJadRm2i/OBzGZWLFnE2SDiRZ7AkEAhUv/fU/DAoFUcpZrX1fPTCrMtnvpnE7f53zqaogv/d7jR3zmjSfg4cldjvm+XyB94ASHnx2q7MXBOuQajAWt0wJAYx626bp5gL+rvvIfxfj1PiUozDUHd6zXd2lV4+Bb43QQknfNpgy6bCAK0XcVcqGPX1jSH6rmCd5C6+COc9p78wJBAMDIbcp+GyEHgGEzwLYjMPFFZi4MlCCAuM2WooukoLGuGp2eZ5I+KobYYhvs9leZbIReb1usvmzrbFi/0cSjhRU\=
+worker.idlenessdetector.scheduletime=
+worker.xidletime64.path=lib/libxidletime-1.0_amd64.so
+commune.certification.file.mycertificatefilepath=/local/marcosancj/work/Ourgrid/certification/mycertificate/mycertificate.cer
+commune.publickey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRW+xBxzzNrTrk6Pd604zvIjJ5tk41vDyvki64b7hN25otvBeBMPcJbnDVQ9a2qHS6h4RxSq3h1n7J3uNF0OVPp1+ygggQMmULlOXxVmFVvMUivqG9q9PLpR37fte/FagYbt+AfA0U/GHG7NdAH9HU/lSMtEZt/u7MKLTWT55oLQIDAQAB
worker.use.idlenessdetector.schedule=no
-commune.xmpp.username=worker-username
-worker.guest.storagedir=/home/worker/brokerstorage
-vm.password=worker
-worker.idlenesstime=1200
+commune.fd.wan.detectiontime=120
+commune.fd.localhost.heartbeatdelay=10
+commune.fd.lan.detectiontime=60
worker.idlenessdetector=no
-commune.fd.localhost.detectiontime=60
-commune.xmpp.serversecureport=5223
-vm.disk.type=ide
-worker.peer.publickey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCw72/LmH4pZhFRy4RblVdc0X9U7ndAiU23MDr79ggeQx1tHwhvLV+WTT1Vuv4jeSHH4vsC80/7LZtcShKvcy8+XaVmH9SV3fb5fR/Qc13daT6w+ZJkQJJfmBkaxEZBJNv55+uO3xTwgzWNSWZPpR9YeLiljrg9Ht1MLVZXswtS/QIDAQAB
-vm.user=worker
-commune.xmpp.servername=xmpp.ourgrid.org
-worker.stdout.file=app.stdout
-commune.fd.wan.heartbeatdelay=60
-commune.fd.lan.detectiontime=180
-worker.exitvalue.file=app.exitvalue
+commune.xmpp.username=rei-worker
+confdir=/local/marcosancj/work/Ourgrid
+commune.filetransfer.timeout=120
sync.logger=no
-vm.os=linux
-commune.privatekey=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKXyf/sRUIObvxerx56nWcxn1eQiM8XS7LgxCUnpLBGHYb6mZQMpDCvPP8M22PNo9RpZoCLgv3t7JJ627H22oA/5w/rxdkhV2vOPOT0Kl/nyqzWXlAHKaMl/lR5LtDnKAkpE0KMGoz/IGun310EtfPT2JoQjvBpQqKkeVGEGI24HAgMBAAECgYAhFF3+pkzubzWAenWoYqO741b3yvmXDZyyetPnL9vhAqOxZWntX1lVwlJrj5tfqiRxxDvvt+1zp/B80uoBhU4SjrMKrKfCm/UfqP0KDVmSIUvQXxNuy5QN13HZHcbh7BW4e9CKQZHGkhmbvXqt5+jm3YClT1pSh0fmiBKYE3lXAQJBAODfLTPmuwArjNtBHMzxnw/nMbJXysctJpNIulB7IsX5DCqAU5IXCtGutrn/GkA5w00yqjLHHt8dsSrCIVNuaNcCQQC86zRFliaUZaZjJG5rqxF2eu3kOFZipeV69lCMs9gYG/cOsWMCf9HPYl2+RGlYW4ROqh2qGwol7wdQqyv7u45RAkEAn9jFDxHCd/p9JBYC3QQcZ3eWcgnKEQ9dTnDyT+dX7pZ8OXIC9eP/QtII/eoCxQjKdYPATFwS69L1b0mT2vSu/QJBAJU5mI2K4CiB7p8LbOlBNEcJLRYDZkD/17d8Dv5FJOFOXaVOeu3Dd0A/69paAXhYubbFay8tsqNqHrYar2BlszECQHAzS68rekVfnsXm9R0bpfP84+zJ8MyroqqG0X8almWw3SeMe+Q6AJCuwIWiMXUqPZEsOC1Wb6TPJejReg7oNqQ\=
-worker.stderr.file=app.stderr
+commune.fd.localhost.detectiontime=40
+worker.peer.address=rei-peer@xmpp.ourgrid.org
+commune.fd.wan.heartbeatdelay=30
commune.fd.lan.heartbeatdelay=15
-worker.guest.playpenroot=/home/worker/playpen
-worker.idlenessdetector.scheduletime=
-worker.playpenroot=/tmp/playpen
+commune.xmpp.servername=xmpp.ourgrid.org
+commune.filetransfer.max.simultaneous=10
+commune.xmpp.checkresource=yes
+worker.storagedir=.brokerstorage
+commune.xmpp.serversecureport=5223
+worker.playpenroot=/tmp
+commune.xmpp.password=xmpp-password
+commune.usemonitor=no
+worker.spec.reporttime=120
+worker.spec.report=no
+worker.idlenesstime=1200
+commune.filetransfer.notify.progress=no
commune.xmpp.serverport=5222
-vm.memory=128
-commune.filetransfer.timeout=600
-commune.publickey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCl8n/7EVCDm78Xq8eep1nMZ9XkIjPF0uy4MQlJ6SwRh2G+pmUDKQwrzz/DNtjzaPUaWaAi4L97eySetux9tqAP+cP68XZIVdrzjzk9Cpf58qs1l5QBymjJf5UeS7Q5ygJKRNCjBqM/yBrp99dBLXz09iaEI7waUKipHlRhBiNuBwIDAQAB

0 comments on commit 13a15fd

Please sign in to comment.
Something went wrong with that request. Please try again.