diff --git a/linux/build-packages.sh b/linux/build-packages.sh index a42fd1c..a0c260b 100755 --- a/linux/build-packages.sh +++ b/linux/build-packages.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.0.0 +VERSION=1.1.0 RELEASE=1 top=`pwd` diff --git a/linux/debian/changelog b/linux/debian/changelog index e09ad98..30efe00 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,5 +1,12 @@ ogagent (1.0.0) stable; urgency=medium - * Initial release for OpenGnSys Agent + * Initial release for OpenGnsys Agent -- Adolfo Gómez García Tue, 18 Jul 2015 03:18:22 +0200 + +ogagent (1.1.0) stable; urgency=medium + + * Functional OpenGnsys Agent interacting with OpenGnsys Server 1.1.0 + + -- Ramón M. Gómez Tue, 13 Oct 2016 17:00:00 +0200 + diff --git a/linux/debian/control b/linux/debian/control index 275b89f..e89e8da 100644 --- a/linux/debian/control +++ b/linux/debian/control @@ -11,5 +11,5 @@ Section: admin Priority: optional Architecture: all Depends: policykit-1(>=0.100), python-requests (>=0.8.2), python-qt4 (>=4.9), python-six(>=1.1), python-prctl(>=1.1.1), python (>=2.7), libxss1, ${misc:Depends} -Description: Agent for OpenGnSys - This package provides the required components to allow this machine to work on an environment managed by OpenGnSys. +Description: OpenGnsys Agent for Operating Systems + This package provides the required components to allow this machine to work on an environment managed by OpenGnsys. diff --git a/linux/debian/copyright b/linux/debian/copyright index cef2d43..8e5ceac 100644 --- a/linux/debian/copyright +++ b/linux/debian/copyright @@ -1,7 +1,7 @@ Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 -Name: udsactor +Name: ogagent Maintainer: Adolfo Gómez García -Source: http://www.udsenterprise.com/ +Source: http://opengnsys.es Copyright: 2014 Virtual Cable S.L.U. License: BSD-3-clause @@ -23,4 +23,4 @@ with this program; if not, write to the Free Software Foundation, Inc., . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file -`/usr/share/common-licenses/GPL-2'. \ No newline at end of file +`/usr/share/common-licenses/GPL-2'. diff --git a/linux/debian/ogagent.init b/linux/debian/ogagent.init index f78341f..3eee35c 100644 --- a/linux/debian/ogagent.init +++ b/linux/debian/ogagent.init @@ -5,7 +5,7 @@ # Required-Stop: $local_fs $remote_fs $network $syslog $named # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: OpenGnSys Agent Service +# Short-Description: OpenGnsys Agent Service ### END INIT INFO # diff --git a/linux/desktop/OGAgentTool.desktop b/linux/desktop/OGAgentTool.desktop index 28ff094..fd3867d 100644 --- a/linux/desktop/OGAgentTool.desktop +++ b/linux/desktop/OGAgentTool.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -Name=OpenGnSys Agent Tools -Comment=OpenGnSys Userspace tools +Name=OpenGnsys Agent Tools +Comment=OpenGnsys Userspace tools Exec=/usr/bin/OGAgentTool-startup Icon=/usr/share/OGAgent/img/oga.png Terminal=false diff --git a/linux/ogagent-template.spec b/linux/ogagent-template.spec index 072955e..b9f1e54 100644 --- a/linux/ogagent-template.spec +++ b/linux/ogagent-template.spec @@ -8,12 +8,12 @@ BuildRoot: %{buildroot} Name: %{name} Version: %{version} Release: %{release} -Summary: OpenGnSys Agent & tools +Summary: OpenGnsys Agent & tools License: BSD3 Group: Admin Requires: python-six python-requests PyQt4 libXScrnSaver -Vendor: Virtual Cable S.L.U. -URL: http://www.udsenterprise.com +Vendor: OpenGnsys Project +URL: http://opengnsys.es Provides: ogagent %define _rpmdir ../ @@ -47,11 +47,11 @@ if [ $1 -eq 0 ]; then rm -rf /etc/ogagent rm /var/log/ogagent.log fi -# And, posibly, the .pyc leaved behind on /usr/share/UDSActor +# And, posibly, the .pyc leaved behind on /usr/share/OGAgent rm -rf /usr/share/OGAgent > /dev/null 2>&1 %description -This package provides the required components to allow this machine to work on an environment managed by OpenGnSys. +This package provides the required components to allow this machine to work on an environment managed by OpenGnsys. %files %defattr(-,root,root) diff --git a/src/about-dialog.ui b/src/about-dialog.ui index 5a6a8d3..4113948 100644 --- a/src/about-dialog.ui +++ b/src/about-dialog.ui @@ -65,7 +65,7 @@ - Version 1.0.0 + Version 1.1.0 @@ -109,10 +109,12 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Verdana'; font-size:9pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-weight:600;">(c) 2014, Virtual Cable S.L.U.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-weight:600;">OpenGnsys Agent for Operating Systems (OGAgent) is based on UDS Actor from Virtual Cable S.L.U.</span></p> +<p style=" margin-top:5px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-weight:600;">UDS Actor is (c) 2014, Virtual Cable S.L.U.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-style:italic;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.udsenterprise.com"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;">http://www.opengnsys.es</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.openuds.org"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;">http://www.udsenterprise.com</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:8pt; color:#000000;">More info:</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:10px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://opengnsys.es/"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;">OpenGnsys Project</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:10px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/dkmstr/openuds/tree/master"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;">openuds on GitHub</span></a></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';"><br /></p></body></html> @@ -140,7 +142,9 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Verdana'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">Adolfo Gómez García &lt;agomez@virtualcable.es&gt;</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">UDS Actor developer: Adolfo Gómez García &lt;agomez@virtualcable.es&gt;</span></p> +<p style=" margin-top:5px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">OGAgent contributor: Ramón M. Gómez &lt;ramongomez@us.es&gt;</span></p> +</body></html> true diff --git a/src/opengnsys/__init__.py b/src/opengnsys/__init__.py index 43c033d..48453fb 100644 --- a/src/opengnsys/__init__.py +++ b/src/opengnsys/__init__.py @@ -37,9 +37,9 @@ import six import modules from RESTApi import REST, RESTError -VERSION = '1.0.0' +VERSION = '1.1.0' -__title__ = 'OpenGnSys Agent' +__title__ = 'OpenGnsys Agent' __version__ = VERSION __build__ = 0x010750 __author__ = 'Adolfo Gómez' diff --git a/src/opengnsys/windows/OGAgentService.py b/src/opengnsys/windows/OGAgentService.py index 2873607..71716d7 100644 --- a/src/opengnsys/windows/OGAgentService.py +++ b/src/opengnsys/windows/OGAgentService.py @@ -49,12 +49,12 @@ from opengnsys.log import logger class OGAgentSvc(win32serviceutil.ServiceFramework, CommonService): ''' - This class represents a Windows Service for managing actor interactions - with UDS Broker and Machine + This class represents a Windows Service for managing Agent interactions + with OpenGnsys Server ''' _svc_name_ = "OGAgent" - _svc_display_name_ = "OpenGnSys Agent Service" - _svc_description_ = "OpenGnSys Agent for machines" + _svc_display_name_ = "OpenGnsys Agent Service" + _svc_description_ = "OpenGnsys Agent for Operating Systems" # 'System Event Notification' is the SENS service _svc_deps_ = ['EventLog'] diff --git a/src/setup.py b/src/setup.py index 7d6e80c..bd3561c 100644 --- a/src/setup.py +++ b/src/setup.py @@ -30,7 +30,7 @@ @author: Adolfo Gómez, dkmaster at dkmon dot com ''' -VERSION = '1.0.0' +VERSION = '1.1.0' # ModuleFinder can't handle runtime changes to __path__, but win32com uses them try: diff --git a/windows/ogagent.nsi b/windows/ogagent.nsi index 7e7cd71..e53d63d 100644 --- a/windows/ogagent.nsi +++ b/windows/ogagent.nsi @@ -1,15 +1,15 @@ # We need http://nsis.sourceforge.net/NSIS_Simple_Firewall_Plugin # Copy inside the two x86_xxxxx folders inside nsis plugins folder -Name "OpenGnSys Agent" +Name "OpenGnsys Agent" # OpenGnsys Actor version -!define OGA_VERSION 1.0.0 +!define OGA_VERSION 1.1.0 # General Symbol Definitions !define REGKEY "SOFTWARE\OGAgent" !define VERSION ${OGA_VERSION}.0 -!define COMPANY "Virtual Cable S.L.U." -!define URL http://www.udsenterprise.com +!define COMPANY "OpenGnsys Project" +!define URL http://opengnsys.es # MultiUser Symbol Definitions !define MULTIUSER_EXECUTIONLEVEL Admin @@ -56,7 +56,7 @@ Var StartMenuGroup !insertmacro MUI_LANGUAGE German # Installer attributes -BrandingText "OpenGnSys" +BrandingText "OpenGnsys" OutFile OGAgentSetup-${OGA_VERSION}.exe InstallDir OGAgent CRCCheck on @@ -68,7 +68,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} ProductVersion "${VERSION}" VIAddVersionKey /LANG=${LANG_ENGLISH} CompanyName "${COMPANY}" VIAddVersionKey /LANG=${LANG_ENGLISH} CompanyWebsite "${URL}" VIAddVersionKey /LANG=${LANG_ENGLISH} FileVersion "${VERSION}" -VIAddVersionKey /LANG=${LANG_ENGLISH} FileDescription "OpenGnSys Agent installer" +VIAddVersionKey /LANG=${LANG_ENGLISH} FileDescription "OpenGnsys Agent installer" VIAddVersionKey /LANG=${LANG_ENGLISH} LegalCopyright "(c) 2015 Virtual Cable S.L.U." InstallDirRegKey HKLM "${REGKEY}" Path ShowUninstDetails show @@ -101,12 +101,12 @@ Section -post SEC0001 WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 ExecWait '"$INSTDIR\vcredist_x86.exe" /passive /norestart' # Add the application to the firewall exception list - All Networks - All IP Version - Enabled - # SimpleFC::AddApplication "OpenGnSys Agent Service" "$INSTDIR\OGAgentService.exe" 0 2 "" 1 + # SimpleFC::AddApplication "OpenGnsys Agent Service" "$INSTDIR\OGAgentService.exe" 0 2 "" 1 # SimpleFC::AdvAddRule [name] [description] [protocol] [direction] # [status] [profile] [action] [application] [service_name] [icmp_types_and_codes] # [group] [local_ports] [remote_ports] [local_address] [remote_address] # - SimpleFC::AdvAddRule "OpenGnSys Agent Firewall rules" "Firewall rules for OpenGnSys Agent interaction with broker." "6" "1" \ + SimpleFC::AdvAddRule "OpenGnsys Agent Firewall rules" "Firewall rules for OpenGnsys Agent interaction with broker." "6" "1" \ "1" "7" "1" "$INSTDIR\OGAgentService.exe" "" "" \ "" "" "" "" "" Pop $0 ; return error(1)/success(0) @@ -141,11 +141,11 @@ SectionEnd Section -un.post UNSEC0001 # Remove application from the firewall exception list # SimpleFC::RemoveApplication "$INSTDIR\OGAgentService.exe" - SimpleFC::AdvRemoveRule "OpenGnSys Agent Firewall rules" + SimpleFC::AdvRemoveRule "OpenGnsys Agent Firewall rules" Pop $0 ; return error(1)/success(0) SetShellVarContext current - StrCpy $StartMenuGroup "OpenGnSys Agent" + StrCpy $StartMenuGroup "OpenGnsys Agent" DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^UninstallLink).lnk" Delete /REBOOTOK $INSTDIR\OGAgentUninstaller.exe @@ -163,7 +163,7 @@ SectionEnd # Installer functions Function .onInit InitPluginsDir - StrCpy $StartMenuGroup "OpenGnSys Agent" + StrCpy $StartMenuGroup "OpenGnsys Agent" !insertmacro MUI_LANGDLL_DISPLAY !insertmacro MULTIUSER_INIT @@ -171,7 +171,7 @@ FunctionEnd # Uninstaller functions Function un.onInit - StrCpy $StartMenuGroup "OpenGnSys Agent" + StrCpy $StartMenuGroup "OpenGnsys Agent" !insertmacro MUI_UNGETLANGUAGE !insertmacro MULTIUSER_UNINIT !insertmacro SELECT_UNSECTION Main ${UNSEC0000}