Skip to content
Permalink
Browse files

Update to 1.1.0 from source

  • Loading branch information...
mrmarkuz committed Jul 14, 2019
1 parent af15620 commit 025412b2943b90677ee2992c3ed60d3a3ac7cd31
Showing with 525 additions and 51 deletions.
  1. +11 −2 nethserver-guacamole.spec
  2. +1 −1 root/etc/e-smith/events/actions/nethserver-guacamole-conf
  3. +14 −0 root/etc/systemd/system/guacd.service
  4. +279 −37 root/opt/guacamole/001-create-schema.sql
  5. +15 −11 root/opt/guacamole/002-create-admin-user.sql
  6. BIN root/usr/local/lib/libguac-client-rdp.a
  7. +41 −0 root/usr/local/lib/libguac-client-rdp.la
  8. BIN root/usr/local/lib/libguac-client-rdp.so.0
  9. BIN root/usr/local/lib/libguac-client-rdp.so.0.0.0
  10. BIN root/usr/local/lib/libguac-client-ssh.a
  11. +41 −0 root/usr/local/lib/libguac-client-ssh.la
  12. BIN root/usr/local/lib/libguac-client-ssh.so.0
  13. BIN root/usr/local/lib/libguac-client-ssh.so.0.0.0
  14. BIN root/usr/local/lib/libguac-client-telnet.a
  15. +41 −0 root/usr/local/lib/libguac-client-telnet.la
  16. BIN root/usr/local/lib/libguac-client-telnet.so.0
  17. BIN root/usr/local/lib/libguac-client-telnet.so.0.0.0
  18. BIN root/usr/local/lib/libguac-client-vnc.a
  19. +41 −0 root/usr/local/lib/libguac-client-vnc.la
  20. BIN root/usr/local/lib/libguac-client-vnc.so.0
  21. BIN root/usr/local/lib/libguac-client-vnc.so.0.0.0
  22. BIN root/usr/local/lib/libguac.a
  23. +41 −0 root/usr/local/lib/libguac.la
  24. BIN root/usr/local/lib/libguac.so.17
  25. BIN root/usr/local/lib/libguac.so.17.0.0
  26. BIN root/usr/local/sbin/guacd
  27. BIN root/var/lib/guacamole/extensions/guacamole-auth-jdbc-mysql-0.9.13-incubating.jar
  28. BIN root/var/lib/guacamole/extensions/guacamole-auth-ldap-0.9.13-incubating.jar
  29. BIN root/var/lib/guacamole/guacamole.war
  30. BIN root/var/lib/guacamole/lib/mysql-connector-java-5.1.44-bin.jar
@@ -1,21 +1,29 @@
Summary: Guacamole for NethServer
Name: nethserver-guacamole
Version: 0.0.0
Release: 3%{?dist}
Release: 4%{?dist}
License: GPL
URL: %{url_prefix}/%{name}
Source0: %{name}-%{version}.tar.gz
BuildArch: noarch

Requires: nethserver-mysql,java-1.7.0-openjdk-devel
Requires: nethserver-mysql,java-1.8.0-openjdk-devel
#Requires: nethserver-base,nethserver-tomcat,guacd,libguac-client-rdp,libguac-client-ssh,libguac-client-vnc,gnu-free-mono-fonts
Requires: nethserver-base,nethserver-tomcat,guacd,libguac-client-rdp,libguac-client-ssh,libguac-client-vnc,gnu-free-mono-fonts


BuildRequires: perl
BuildRequires: nethserver-devtools

%description
Apache Guacamole NethServer integration

%pre
if ! getent passwd guacd >/dev/null; then
# Add the "mattermost" user
useradd -r -U -s /sbin/nologin -d /var/lib/nethserver/guacd guacd
fi

%prep
%setup

@@ -25,6 +33,7 @@ perl createlinks
%install
rm -rf %{buildroot}
(cd root; find . -depth -print | cpio -dump %{buildroot})
mkdir -p %{buildroot}/var/lib/nethserver/mattermost
%{genfilelist} %{buildroot} > %{name}-%{version}-filelist

%post
@@ -16,7 +16,7 @@ ln -vfs /usr/local/lib/freerdp/guac* /usr/lib64/freerdp

if [ ! -d /var/lib/mysql/guacamole ] ; then
mysql -e "CREATE DATABASE guacamole;"
mysql -e "GRANT SELECT,INSERT,UPDATE,DELETE ON guacamole.* TO 'guacamole'@'localhost' IDENTIFIED BY 'guacamole';"
mysql -e "GRANT SELECT,INSERT,UPDATE,DELETE ON guacamole.* TO 'guacamole'@'localhost' IDENTIFIED BY '`cat /var/lib/nethserver/secret/guacamole`';"
mysql -e "FLUSH PRIVILEGES;"

cat /opt/guacamole/*.sql | mysql -Dguacamole
@@ -0,0 +1,14 @@
[Unit]
Description=Guacd
After=network.target

[Service]
Type=idle
User=guacd
Group=guacd
ExecStart=/opt/keycloak/current/bin/standalone.sh -b 0.0.0.0
TimeoutStartSec=600
TimeoutStopSec=600

[Install]
WantedBy=multi-user.target

0 comments on commit 025412b

Please sign in to comment.
You can’t perform that action at this time.