#840: Creación de nuevos OGAgent para versión 1.1.1 en desarrollo.
parent
855c6d721d
commit
219fba068c
|
|
@ -36,10 +36,8 @@ Instalar OGAgent en cliente modelo
|
||||||
- Descargar el fichero correspondiente en el sistema operativo del cliente.
|
- Descargar el fichero correspondiente en el sistema operativo del cliente.
|
||||||
|
|
||||||
- Ubuntu, Debian y derivados:
|
- Ubuntu, Debian y derivados:
|
||||||
- Instalar dependencias (NOTA: revisar dependencias para Ubuntu 12.04):
|
|
||||||
sudo apt-get install -y libxss1 policykit-1 python python-requests python-qt4 python-six python-prctl
|
|
||||||
- Descargar e instalar el agente:
|
- Descargar e instalar el agente:
|
||||||
sudo dpkg -i ogagent_Version_all.deb
|
sudo apt install ./ogagent_Version_all.deb
|
||||||
- Configurar el agente:
|
- Configurar el agente:
|
||||||
sudo sed -i "0,/remote=/ s,remote=.*,remote=https://IPServidorOpenGnsys/opengnsys/rest/," /usr/share/OGAgent/cfg/ogagent.cfg
|
sudo sed -i "0,/remote=/ s,remote=.*,remote=https://IPServidorOpenGnsys/opengnsys/rest/," /usr/share/OGAgent/cfg/ogagent.cfg
|
||||||
- Iniciar el servicio (se iniciará automáticamente en el proceso de arranque):
|
- Iniciar el servicio (se iniciará automáticamente en el proceso de arranque):
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
VERSION=1.1.0
|
|
||||||
RELEASE=1
|
|
||||||
|
|
||||||
cd $(dirname "$0")
|
cd $(dirname "$0")
|
||||||
top=`pwd`
|
top=`pwd`
|
||||||
|
|
||||||
|
[ -r ../src/VERSION ] && VERSION="$(cat ../src/VERSION)" || VERSION="1.1.0"
|
||||||
|
RELEASE="1"
|
||||||
|
|
||||||
# Debian based
|
# Debian based
|
||||||
dpkg-buildpackage -b -d
|
dpkg-buildpackage -b -d
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,14 @@
|
||||||
|
ogagent (1.1.1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* OGAgent code retrieved from GitHub
|
||||||
|
|
||||||
|
-- Ramón M. Gómez <ramongomez@us.es> Sun, 3 Jun 2018 13:00:00 +0200
|
||||||
|
|
||||||
ogagent (1.1.0) stable; urgency=medium
|
ogagent (1.1.0) stable; urgency=medium
|
||||||
|
|
||||||
* Functional OpenGnsys Agent interacting with OpenGnsys Server 1.1.0
|
* Functional OpenGnsys Agent interacting with OpenGnsys Server 1.1.0
|
||||||
|
|
||||||
-- Ramón M. Gómez <ramongomez@us.es> Tue, 13 Oct 2016 17:00:00 +0200
|
-- Ramón M. Gómez <ramongomez@us.es> Tue, 13 Oct 2016 17:00:00 +0100
|
||||||
|
|
||||||
ogagent (1.0.0) stable; urgency=medium
|
ogagent (1.0.0) stable; urgency=medium
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
# Create macOS installation packages.
|
# Create macOS installation packages.
|
||||||
# Based on bomutils tutorail: http://bomutils.dyndns.org/tutorial.html
|
# Based on bomutils tutorail: http://bomutils.dyndns.org/tutorial.html
|
||||||
|
|
||||||
VERSION=1.1.0
|
cd $(dirname $0)
|
||||||
|
[ -r ../src/VERSION ] && VERSION="$(cat ../src/VERSION)" || VERSION="1.1.0"
|
||||||
AUTHOR="OpenGnsys Project"
|
AUTHOR="OpenGnsys Project"
|
||||||
|
|
||||||
# Create empty directories.
|
# Create empty directories.
|
||||||
cd $(dirname $0)
|
|
||||||
rm -fr build
|
rm -fr build
|
||||||
mkdir -p build && cd build
|
mkdir -p build && cd build
|
||||||
mkdir -p flat/base.pkg flat/Resources/en.lproj
|
mkdir -p flat/base.pkg flat/Resources/en.lproj
|
||||||
|
|
@ -57,7 +57,7 @@ mkbom -u 0 -g 80 root flat/base.pkg/Bom
|
||||||
cat << EOT > flat/Distribution
|
cat << EOT > flat/Distribution
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<installer-script minSpecVersion="1.000000" authoringTool="com.apple.PackageMaker" authoringToolVersion="3.0.3" authoringToolBuild="174">
|
<installer-script minSpecVersion="1.000000" authoringTool="com.apple.PackageMaker" authoringToolVersion="3.0.3" authoringToolBuild="174">
|
||||||
<title>OGAgent 1.1.0</title>
|
<title>OGAgent $VERSION</title>
|
||||||
<options customize="never" allow-external-scripts="no"/>
|
<options customize="never" allow-external-scripts="no"/>
|
||||||
<domains enable_anywhere="true"/>
|
<domains enable_anywhere="true"/>
|
||||||
<installation-check script="pm_install_check();"/>
|
<installation-check script="pm_install_check();"/>
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
1.1.0
|
1.1.1
|
||||||
|
|
|
||||||
|
|
@ -26,9 +26,9 @@
|
||||||
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
'''
|
"""
|
||||||
@author: Adolfo Gómez, dkmaster at dkmon dot com
|
@author: Adolfo Gómez, dkmaster at dkmon dot com
|
||||||
'''
|
"""
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
# On centos, old six release does not includes byte2int, nor six.PY2
|
# On centos, old six release does not includes byte2int, nor six.PY2
|
||||||
|
|
@ -37,7 +37,11 @@ import six
|
||||||
import modules
|
import modules
|
||||||
from RESTApi import REST, RESTError
|
from RESTApi import REST, RESTError
|
||||||
|
|
||||||
VERSION = '1.1.0'
|
try:
|
||||||
|
with open('VERSION', 'r') as v:
|
||||||
|
VERSION = v.read()
|
||||||
|
except IOError:
|
||||||
|
VERSION = '1.1.0'
|
||||||
|
|
||||||
__title__ = 'OpenGnsys Agent'
|
__title__ = 'OpenGnsys Agent'
|
||||||
__version__ = VERSION
|
__version__ = VERSION
|
||||||
|
|
@ -46,7 +50,6 @@ __author__ = 'Adolfo Gómez'
|
||||||
__license__ = "BSD 3-clause"
|
__license__ = "BSD 3-clause"
|
||||||
__copyright__ = "Copyright VirtualCable S.L.U."
|
__copyright__ = "Copyright VirtualCable S.L.U."
|
||||||
|
|
||||||
|
|
||||||
if not hasattr(six, 'byte2int'):
|
if not hasattr(six, 'byte2int'):
|
||||||
if six.PY3:
|
if six.PY3:
|
||||||
import operator
|
import operator
|
||||||
|
|
|
||||||
25
src/setup.py
25
src/setup.py
|
|
@ -26,12 +26,10 @@
|
||||||
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
'''
|
"""
|
||||||
@author: Adolfo Gómez, dkmaster at dkmon dot com
|
@author: Adolfo Gómez, dkmaster at dkmon dot com
|
||||||
@author: Ramón M. Gómez, ramongomez at us dot es
|
@author: Ramón M. Gómez, ramongomez at us dot es
|
||||||
'''
|
"""
|
||||||
|
|
||||||
VERSION = '1.1.0'
|
|
||||||
|
|
||||||
# ModuleFinder can't handle runtime changes to __path__, but win32com uses them
|
# ModuleFinder can't handle runtime changes to __path__, but win32com uses them
|
||||||
try:
|
try:
|
||||||
|
|
@ -44,7 +42,8 @@ try:
|
||||||
import py2exe.mf as modulefinder
|
import py2exe.mf as modulefinder
|
||||||
except ImportError:
|
except ImportError:
|
||||||
import modulefinder
|
import modulefinder
|
||||||
import win32com, sys
|
import win32com
|
||||||
|
import sys
|
||||||
for p in win32com.__path__[1:]:
|
for p in win32com.__path__[1:]:
|
||||||
modulefinder.AddPackagePath("win32com", p)
|
modulefinder.AddPackagePath("win32com", p)
|
||||||
for extra in ["win32com.shell"]: # ,"win32com.mapi"
|
for extra in ["win32com.shell"]: # ,"win32com.mapi"
|
||||||
|
|
@ -56,13 +55,21 @@ except ImportError:
|
||||||
# no build path setup, no worries.
|
# no build path setup, no worries.
|
||||||
pass
|
pass
|
||||||
|
|
||||||
from distutils.core import setup
|
|
||||||
import py2exe
|
|
||||||
import sys
|
|
||||||
import os
|
import os
|
||||||
|
from distutils.core import setup
|
||||||
|
|
||||||
|
import sys
|
||||||
|
|
||||||
|
# Reading version file:
|
||||||
|
try:
|
||||||
|
with open('VERSION', 'r') as v:
|
||||||
|
VERSION = v.read()
|
||||||
|
except IOError:
|
||||||
|
VERSION = '1.1.0'
|
||||||
|
|
||||||
sys.argv.append('py2exe')
|
sys.argv.append('py2exe')
|
||||||
|
|
||||||
|
|
||||||
def get_requests_cert_file():
|
def get_requests_cert_file():
|
||||||
"""Add Python requests or certifi .pem file for installers."""
|
"""Add Python requests or certifi .pem file for installers."""
|
||||||
import requests
|
import requests
|
||||||
|
|
@ -115,7 +122,7 @@ setup(
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
service=[udsservice],
|
service=[udsservice],
|
||||||
data_files=[('', [get_requests_cert_file()]),('cfg', ['cfg/ogagent.cfg', 'cfg/ogclient.cfg'])],
|
data_files=[('', [get_requests_cert_file()]), ('cfg', ['cfg/ogagent.cfg', 'cfg/ogclient.cfg'])],
|
||||||
options={
|
options={
|
||||||
'py2exe': {
|
'py2exe': {
|
||||||
'bundle_files': 3,
|
'bundle_files': 3,
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ function process {
|
||||||
}
|
}
|
||||||
|
|
||||||
cd $(dirname "$0")
|
cd $(dirname "$0")
|
||||||
|
[ -r VERSION ] && sed -i "s/Version [^<]*/Version $(cat VERSION)/" about-dialog.ui
|
||||||
pyrcc4 -py3 OGAgent.qrc -o OGAgent_rc.py
|
pyrcc4 -py3 OGAgent.qrc -o OGAgent_rc.py
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue