[X2go-Commits] x2goadmincenter.git - master (branch) updated: bd45e1a6373efeb3983c899804c1780a0c0d1d09

The branch, master has been updated via bd45e1a6373efeb3983c899804c1780a0c0d1d09 (commit) from dabab620f3d2ac0b3e07d03494d4673d495c6c8f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bd45e1a6373efeb3983c899804c1780a0c0d1d09 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Sep 22 00:49:40 2011 +0200 provide Debian packaging ----------------------------------------------------------------------- Summary of changes: AUTHORS | 2 + Makefile | 30 ++++++++ debian/changelog | 5 + debian/compat | 1 + debian/control | 57 ++++++++++++++ debian/copyright | 32 ++++++++ debian/menu | 6 ++ debian/rules | 7 ++ debian/source/format | 1 + debian/x2goadmincenter.dirs | 3 + debian/x2goadmincenter.docs | 2 + debian/x2goadmincenter.install | 2 + debian/x2goadmincenter.manpages | 1 + debian/x2goadminserver.dirs | 5 + debian/x2goadminserver.docs | 2 + debian/x2goadminserver.install | 3 + debian/x2goadminserver.manpages | 2 + x2goadmincenter/Makefile | 72 ++++++++++++++++++ x2goadmincenter/Makefile.docupload | 20 +++++ x2goadmincenter/Makefile.man2html | 22 ++++++ x2goadmincenter/icons/x2goadmincenter.xpm | 47 ++++++++++++ x2goadmincenter/man/man8/x2goadmincenter.8 | 22 ++++++ x2goadminserver/Makefile | 72 ++++++++++++++++++ x2goadminserver/Makefile.docupload | 18 +++++ x2goadminserver/Makefile.man2html | 22 ++++++ x2goadminserver/{ => cgi-bin}/x2gorpcserver.cgi | 19 +++++ x2goadminserver/etc/x2goadminserver.conf | 24 ++++++ x2goadminserver/lib/x2goadminserver.pm | 79 ++++++++++++++++++++ .../x2goadminserver_backend_cipux.pm} | 25 ++++++- x2goadminserver/man/man5/x2goadminserver.conf.5 | 22 ++++++ x2goadminserver/man/man8/x2gorpcserver.cgi.8 | 22 ++++++ x2goadminserver/x2goadminserver | 5 - x2goadminserver/x2goadminserver.pm | 60 --------------- 33 files changed, 644 insertions(+), 68 deletions(-) create mode 100644 AUTHORS create mode 100755 Makefile create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/menu create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/x2goadmincenter.dirs create mode 100644 debian/x2goadmincenter.docs create mode 100644 debian/x2goadmincenter.install create mode 100644 debian/x2goadmincenter.manpages create mode 100644 debian/x2goadminserver.dirs create mode 100644 debian/x2goadminserver.docs create mode 100644 debian/x2goadminserver.install create mode 100644 debian/x2goadminserver.manpages create mode 100755 x2goadmincenter/Makefile create mode 100644 x2goadmincenter/Makefile.docupload create mode 100644 x2goadmincenter/Makefile.man2html create mode 100644 x2goadmincenter/icons/x2goadmincenter.xpm create mode 100644 x2goadmincenter/man/man8/x2goadmincenter.8 create mode 100755 x2goadminserver/Makefile create mode 100644 x2goadminserver/Makefile.docupload create mode 100644 x2goadminserver/Makefile.man2html rename x2goadminserver/{ => cgi-bin}/x2gorpcserver.cgi (72%) create mode 100644 x2goadminserver/etc/x2goadminserver.conf create mode 100644 x2goadminserver/lib/x2goadminserver.pm rename x2goadminserver/{x2gocipux.pm => lib/x2goadminserver_backend_cipux.pm} (92%) create mode 100644 x2goadminserver/man/man5/x2goadminserver.conf.5 create mode 100644 x2goadminserver/man/man8/x2gorpcserver.cgi.8 delete mode 100644 x2goadminserver/x2goadminserver delete mode 100644 x2goadminserver/x2goadminserver.pm The diff of changes is: diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..bc61109 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,2 @@ +Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> diff --git a/Makefile b/Makefile new file mode 100755 index 0000000..ccb1261 --- /dev/null +++ b/Makefile @@ -0,0 +1,30 @@ +#!/usr/bin/make -f + +all: build + +build: build-arch build-indep + +# make man2html build available from project's base folder... +build_man2html: + cd x2goadmincenter && make $@ + cd x2goadminserver && make $@ + +clean: + cd x2goadmincenter && make $@ + cd x2goadminserver && make $@ + +build-arch: + cd x2goadmincenter && make $@ + cd x2goadminserver && make $@ + +build-indep: + cd x2goadmincenter && make $@ + cd x2goadminserver && make $@ + +install: + cd x2goadmincenter && make $@ + cd x2goadminserver && make $@ + +uninstall: + cd x2goadmincenter && make $@ + cd x2goadminserver && make $@ diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..544a6e6 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +x2goadmincenter (0.0.0.1-0~x2go1) UNRELEASED; urgency=low + + * Initial package build for Debian/Ubuntu. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 21 Sep 2011 21:12:56 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..4b33b89 --- /dev/null +++ b/debian/control @@ -0,0 +1,57 @@ +Source: x2goadmincenter +Section: x11 +Priority: extra +Maintainer: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +Uploaders: + Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Build-Depends: + debhelper (>= 7.0.50~), + libqt4-dev, + libldap2-dev, + libssh-dev (>= 0.4.7), + libx11-dev, + doxygen, + man2html-base | man2html +Standards-Version: 3.9.2 +Homepage: http://code.x2go.org/releases/source/x2goadmincenter +Vcs-Git: git://code.x2go.org/x2goadmincenter.git +Vcs-Browser: http://code.x2go.org/gitweb?p=x2goadmincenter.git;a=summary + +Package: x2goadmincenter +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, +Description: X2go Administration Center (Qt4 client) + X2go is a serverbased computing environment with + - session resuming + - low bandwith support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + x2goadmincenter is a graphical client (Qt4) for the X2go administration + interface. You can use it to administrate single X2go server, as well as + multi-server based X2go clusters. + +Package: x2goadminserver +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + nxproxy +Description: X2go Administration Server (CGI) + X2go is a serverbased computing environment with + - session resuming + - low bandwith support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + x2goadmincenter is the server side component of the X2go Administration + center. X2go administration server can handle a single X2go server, as well as + multi-server based X2go clusters. + . + For installation instruction/howtos/FAQs please visit http://wiki.x2go.org \ No newline at end of file diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..16f21fd --- /dev/null +++ b/debian/copyright @@ -0,0 +1,32 @@ +Upstream Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + +Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org + +This program is free software; you can redistribute it and/or modify +it under the terms of the Affero GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program; if not, write to the +Free Software Foundation, Inc., +51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +Copyright (C) 2007-2011 Oleksandr Shneyder +oleksandr.shneyder@obviously-nice.de + +Copyright (C) 2007-2011 Heinz-Markus Graesing +heinz-m.graesing@obviously-nice.de + +On Debian systems, the complete text of the GNU Affero General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2007-2011, Mike Gabriel +<mike.gabriel@das-netzwerkteam.de> and is licensed under the GPLv3, +see /usr/share/common-licenses/GPL. + diff --git a/debian/menu b/debian/menu new file mode 100644 index 0000000..5d8701b --- /dev/null +++ b/debian/menu @@ -0,0 +1,6 @@ +?package(x2goadmincenter):\ + needs="X11"\ + section="Applications/System/Administration"\ + title="X2go Administration Center"\ + icon="/usr/share/x2goadmincenter/icons/x2goadmincenter.xpm"\ + command="/usr/bin/x2goadmincenter" diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..d569055 --- /dev/null +++ b/debian/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f + +%: + dh $@ + +override_dh_auto_install: + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/debian/x2goadmincenter.dirs b/debian/x2goadmincenter.dirs new file mode 100644 index 0000000..8702959 --- /dev/null +++ b/debian/x2goadmincenter.dirs @@ -0,0 +1,3 @@ +usr/bin/ +usr/share/x2goadmincenter/icons + diff --git a/debian/x2goadmincenter.docs b/debian/x2goadmincenter.docs new file mode 100644 index 0000000..4a997e1 --- /dev/null +++ b/debian/x2goadmincenter.docs @@ -0,0 +1,2 @@ +AUTHORS +.build_man2html/html diff --git a/debian/x2goadmincenter.install b/debian/x2goadmincenter.install new file mode 100644 index 0000000..f6c43b7 --- /dev/null +++ b/debian/x2goadmincenter.install @@ -0,0 +1,2 @@ +x2goadmincenter/.build/x2goadmincenter usr/bin +x2goadmincenter/icons/x2goadmincenter.xpm usr/share/x2goadmincenter/icons/ diff --git a/debian/x2goadmincenter.manpages b/debian/x2goadmincenter.manpages new file mode 100644 index 0000000..1c5d966 --- /dev/null +++ b/debian/x2goadmincenter.manpages @@ -0,0 +1 @@ +x2goadmincenter/man/man8/x2goadmincenter.8 diff --git a/debian/x2goadminserver.dirs b/debian/x2goadminserver.dirs new file mode 100644 index 0000000..b98656a --- /dev/null +++ b/debian/x2goadminserver.dirs @@ -0,0 +1,5 @@ +etc/x2go +usr/lib/x2go +usr/lib/cgi-bin + + diff --git a/debian/x2goadminserver.docs b/debian/x2goadminserver.docs new file mode 100644 index 0000000..c36cad1 --- /dev/null +++ b/debian/x2goadminserver.docs @@ -0,0 +1,2 @@ +AUTHORS +#.build_man2html/html diff --git a/debian/x2goadminserver.install b/debian/x2goadminserver.install new file mode 100644 index 0000000..b804b84 --- /dev/null +++ b/debian/x2goadminserver.install @@ -0,0 +1,3 @@ +x2goadminserver/etc/x2goadminserver.conf etc/x2go/ +x2goadminserver/lib/* usr/lib/x2go/ +x2goadminserver/cgi-bin/* usr/lib/cgi-bin/ \ No newline at end of file diff --git a/debian/x2goadminserver.manpages b/debian/x2goadminserver.manpages new file mode 100644 index 0000000..3816efe --- /dev/null +++ b/debian/x2goadminserver.manpages @@ -0,0 +1,2 @@ +x2goadminserver/man/man5/x2goadminserver.conf.5 +x2goadminserver/man/man8/x2gorpcserver.cgi.8 diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile new file mode 100755 index 0000000..610c3bb --- /dev/null +++ b/x2goadmincenter/Makefile @@ -0,0 +1,72 @@ +#!/usr/bin/make -f + +SRC_DIR=$(CURDIR) +BUILD_DIR=$(SRC_DIR)/.build +BUILD_BINARY=$(CLIENT_DIR)/x2goadmincenter + +SHELL=/bin/bash + +INSTALL_DIR=install -d -o root -g root -m 755 +INSTALL_FILE=install -o root -g root -m 644 +INSTALL_PROGRAM=install -o root -g root -m 755 + +RM_FILE=rm -f +RM_DIR=rmdir -p --ignore-fail-on-non-empty + +DESTDIR= +PREFIX=/usr/local +BINDIR=$(PREFIX)/bin +SHAREDIR=$(PREFIX)/share +MANDIR=$(SHAREDIR)/man + +all: build + +build: build-arch build-indep + +build-arch: build_admincenter + +build-indep: build_man + +build_admincenter: + mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && qmake-qt4 ../x2goadmincenter.pro + cd $(BUILD_DIR) && $(MAKE) + +build_man: + make -f Makefile.man2html build + +clean: clean_admincenter clean_man + find . -type f -name '*.o' -exec rm -vf {} + + find . -type f -name 'moc_*.cpp' -exec rm -vf {} + + find . -type f -name 'ui_*.h' -exec rm -vf {} + + find . -type f -name 'qrc_*.cpp' -exec rm -vf {} + + rm -f x2goadmincenter + rm -f x2goadmincenter.tag + +clean_admincenter: + rm -fr $(CLIENT_DIR) + +clean_man: + make -f Makefile.man2html clean + +install: install_admincenter install_man + +install_admincenter: + $(INSTALL_DIR) $(DESTDIR)$(BINDIR)/ + $(INSTALL_FILE) $(SRC_DIR)/icons/x2goadmincenter.xpm $(DESTDIR)$(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm + +install_man: + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/ + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 + $(INSTALL_FILE) $(SRC_DIR)/man/man8/x2goadmincenter.8 $(DESTDIR)$(MANDIR)/man1/x2goadmincenter.8 + gzip -f $(DESTDIR)$(MANDIR)/man8/x2goadmincenter.8 + +uninstall: uninstall_admincenter uninstall_man + +uninstall_admincenter: + $(RM_FILE) $(BINDIR)/x2goadmincenter + $(RM_FILE) $(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm + $(RM_DIR) $(SHAREDIR)/x2goadmincenter/icons + +uninstall_man: + $(RM_FILE) $(MANDIR)/man8/x2goadmincenter.8.gz + $(RM_DIR) $(MANDIR)/man8 diff --git a/x2goadmincenter/Makefile.docupload b/x2goadmincenter/Makefile.docupload new file mode 100644 index 0000000..354780f --- /dev/null +++ b/x2goadmincenter/Makefile.docupload @@ -0,0 +1,20 @@ +#!/usr/bin/make -f +# Makefile.docupload file - for x2goclient +# Copyright 2010-2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, GPLv3 applies to this file + +VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1` +DOC_HOST=code.x2go.org +DOC_PATH=/srv/sites/x2go.org/packages/doc/x2goadmincenter/man/ +DOC_USER=x2go-admin + +doc: docbuild docupload + +docbuild: + make -f Makefile.man2html build_man2html + +docupload: + + ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATH}; rm -Rfv ${DOC_PATH}/*; }" + scp -r .build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH}/ + + diff --git a/x2goadmincenter/Makefile.man2html b/x2goadmincenter/Makefile.man2html new file mode 100644 index 0000000..f7401de --- /dev/null +++ b/x2goadmincenter/Makefile.man2html @@ -0,0 +1,22 @@ +#!/usr/bin/make -f + +MAN2HTML_BIN = man2html +MAN2HTML_SRC = man +BUILD_DIR = .build_man2html +MAN2HTML_DEST = $(BUILD_DIR)/html + +man_pages = `cd $(MAN2HTML_SRC) && find * -type f` + +all: build + +build: build_man2html + +build_man2html: + mkdir -p $(MAN2HTML_DEST) + for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done + for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + +clean: clean_man2html + +clean_man2html: + rm -Rf $(BUILD_DIR) diff --git a/x2goadmincenter/icons/x2goadmincenter.xpm b/x2goadmincenter/icons/x2goadmincenter.xpm new file mode 100644 index 0000000..74d2262 --- /dev/null +++ b/x2goadmincenter/icons/x2goadmincenter.xpm @@ -0,0 +1,47 @@ +/* XPM */ +static char *x_goclient_new[] = { +/* columns rows colors chars-per-pixel */ +"32 32 9 1", +" c #1C3C1C3C1C3C", +". c #1F5F1F5F1F5F", +"X c #228222822282", +"o c #25A625A625A6", +"O c #28C928C928C9", +"+ c #2BEC2BEC2BEC", +"@ c #2F0F2F0F2F0F", +"# c #323232323232", +"$ c None", +/* pixels */ +"$o$$$$$$$$$$$$$$$$$$$$$$$$$$$$o$", +"o$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$o", +"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", +"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", +"$$$$$$$$$$$$$$ @###@$$$$$ ##@$$$", +"$$$$$$$$$$$$$$$$@##$$$$$$$O@$$$$", +"$$$$$$$$$$$$$$$$$## $$$$$$#$$$$$", +"$$$$$$$$$$$$$$$$$@#@$$$$$$o$$$$$", +"$$$$$$$$$$$$$$ o$ ##$$$$$#$$$$$$", +"$$$$$$$$$$$$$$$$$$##@$$$ o$$$$$$", +"$$$$$$$$$$$$$$$$$$X##$$$#$$$$$$$", +"$$$$$$$$$$$$$$Xo#$$##o$ o$$$$$$$", +"$$$$$$$$$$$$$$$$$$$@##$#$$$$$$$$", +"$$$$$$$$$$$$$$$$$$$$###o$$$$$$$$", +"$$$$$$$$$$$$$$ o@#o$@##$$$$$$$$$", +"$$$$$$$$$$$$$$$$$$$$$##$$$$$$$$$", +"$$$$$$$$$$$$$$$$$$$$$##@$$$$$$$$", +"$$$$$$$$$$$$$$$@###$X###$$$$$$$$", +"$$$$$$$$$$$$$$$$$$$$#$##@$$$$$$$", +"$$$$$$$$$$$$$$$$$$$ $o##$$$$$$$", +"$$$$$$$$$$$$$$$O#$$#$$$##o$$$$$$", +"$$$$$$$$$$$$$$$$$$ X$$$@##$$$$$$", +"$$$$$$$$$$$$$$$$$$#$$$$$## $$$$$", +"$$$$$$$$$$$$$$$X$X $$$$$###$$$$$", +"$$$$$$$$$$$$$$$$$#$$$$$$$##$$$$$", +"$$$$$$$$$$$$$$$$oX$$$$$$$##@$$$$", +"$$$$$$$$$$$$$$$$#$$$$$$$$o## $$$", +"$$$$$$$$$$$$$$ @#O$$$$$$ #### $$", +"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", +"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", +"X$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$o", +"$X$$$$$$$$$$$$$$$$$$$$$$$$$$$$o$" +}; diff --git a/x2goadmincenter/man/man8/x2goadmincenter.8 b/x2goadmincenter/man/man8/x2goadmincenter.8 new file mode 100644 index 0000000..1319b00 --- /dev/null +++ b/x2goadmincenter/man/man8/x2goadmincenter.8 @@ -0,0 +1,22 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goadmincenter 8 "Sep 2011" "Version 0.0.0.x" "X2go Administration Center (Qt4)" +.SH NAME +x2goadmincenter \- X2go Administration Center +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2goadmincenter\fR + +.SH DESCRIPTION +\fBx2goadmincenter\fR is a GUI application for administrating X2go Servers. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goadminserver/Makefile b/x2goadminserver/Makefile new file mode 100755 index 0000000..0d3d701 --- /dev/null +++ b/x2goadminserver/Makefile @@ -0,0 +1,72 @@ +#!/usr/bin/make -f + +SRC_DIR=$(CURDIR) + +SHELL=/bin/bash + +INSTALL_DIR=install -d -o root -g root -m 755 +INSTALL_FILE=install -o root -g root -m 644 +INSTALL_PROGRAM=install -o root -g root -m 755 + +RM_FILE=rm -f +RM_DIR=rmdir -p --ignore-fail-on-non-empty + +DESTDIR= +PREFIX=/usr/local +ETCDIR=/etc/x2go +BINDIR=$(PREFIX)/bin +SHAREDIR=$(PREFIX)/share +MANDIR=$(SHAREDIR)/man +LIBDIR=$(PREFIX)/lib/x2go + +all: build + +build: build-arch build-indep + +build-arch: + +build-indep: build_man + +build_man: + make -f Makefile.man2html build + +clean: clean_man + +clean_man: + make -f Makefile.man2html clean + +install: install_adminserver install_man + +install_adminserver: + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/ + $(INSTALL_DIR) $(DESTDIR)$(BINDIR)/ + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/ + $(INSTALL_FILE) $(SRC_DIR)/etc/x2goadminserver.conf $(DESTDIR)$(ETCDIR)/ + $(INSTALL_FILE) $(SRC_DIR)/lib/* $(DESTDIR)$(LIBDIR)/ + $(INSTALL_FILE) $(SRC_DIR)/cgi-bin/* $(DESTDIR)$(PREFIX)/lib/cgi-bin + +install_man: + $(INSTALL_DIR) $(DESTDIR)$(MANDIR) + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5 + $(INSTALL_FILE) $(SRC_DIR)/man/man5/*.5 $(DESTDIR)$(MANDIR)/man5 + gzip -f $(DESTDIR)$(MANDIR)/man5/x2go*.5 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 + $(INSTALL_FILE) $(SRC_DIR)/man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 + gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 + +uninstall: uninstall_adminserver + +uninstall_adminserver: + $(RM_FILE) $(ETCDIR)/x2goadminserver.conf + $(RM_FILE) $(PREFIX)/lib/cgi-bin/x2gorpcserver.cgi + $(RM_FILE) $(LIBDIR)/x2goadminserver.pm + $(RM_FILE) $(LIBDIR)/x2goadminserver_backend_*.pm + $(RM_DIR) $(ETCDIR)/ + $(RM_DIR) $(LIBDIR)/ + +uninstall_man: + $(RM_FILE) $(DESTDIR)$(MANDIR)/man5/x2goadminserver.conf.5.gz + $(RM_DIR) $(DESTDIR)$(MANDIR)/man5/ || true + $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/x2gorpcserver.cgi.8.gz + $(RM_DIR) $(DESTDIR)$(MANDIR)/man8/ || true + $(RM_DIR) $(DESTDIR)$(MANDIR)/ || true diff --git a/x2goadminserver/Makefile.docupload b/x2goadminserver/Makefile.docupload new file mode 100644 index 0000000..dbcfa06 --- /dev/null +++ b/x2goadminserver/Makefile.docupload @@ -0,0 +1,18 @@ +#!/usr/bin/make -f +# Makefile.docupload file - for x2goclient +# Copyright 2010-2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, GPLv3 applies to this file + +VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1` +DOC_HOST=code.x2go.org +DOC_PATH=/srv/sites/x2go.org/packages/doc/x2goadminserver/man/ +DOC_USER=x2go-admin + +doc: docbuild docupload + +docbuild: + make -f Makefile.man2html build_man2html + +docupload: + + ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATH}; rm -Rfv ${DOC_PATH}/*; }" + scp -r .build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH}/ diff --git a/x2goadminserver/Makefile.man2html b/x2goadminserver/Makefile.man2html new file mode 100644 index 0000000..f7401de --- /dev/null +++ b/x2goadminserver/Makefile.man2html @@ -0,0 +1,22 @@ +#!/usr/bin/make -f + +MAN2HTML_BIN = man2html +MAN2HTML_SRC = man +BUILD_DIR = .build_man2html +MAN2HTML_DEST = $(BUILD_DIR)/html + +man_pages = `cd $(MAN2HTML_SRC) && find * -type f` + +all: build + +build: build_man2html + +build_man2html: + mkdir -p $(MAN2HTML_DEST) + for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done + for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + +clean: clean_man2html + +clean_man2html: + rm -Rf $(BUILD_DIR) diff --git a/x2goadminserver/x2gorpcserver.cgi b/x2goadminserver/cgi-bin/x2gorpcserver.cgi similarity index 72% rename from x2goadminserver/x2gorpcserver.cgi rename to x2goadminserver/cgi-bin/x2gorpcserver.cgi index ee85ad2..5b6debe 100755 --- a/x2goadminserver/x2gorpcserver.cgi +++ b/x2goadminserver/cgi-bin/x2gorpcserver.cgi @@ -1,5 +1,24 @@ #!/usr/bin/perl -w +# Copyright (C) 2010-2011 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2010-2011 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> + +# X2go Admin Server is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# X2go Admin Server is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, see <http://www.gnu.org/licenses/> +# or write to +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + use strict; use Frontier::RPC2; diff --git a/x2goadminserver/etc/x2goadminserver.conf b/x2goadminserver/etc/x2goadminserver.conf new file mode 100644 index 0000000..7a8b536 --- /dev/null +++ b/x2goadminserver/etc/x2goadminserver.conf @@ -0,0 +1,24 @@ +# Copyright (C) 2010-2011 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2010-2011 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> + +# X2go Admin Server is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# X2go Admin Server is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, see <http://www.gnu.org/licenses/> +# or write to +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +backend=cipux + +[cipux_backend] +url=http://localhost:8001/RPC2 + diff --git a/x2goadminserver/lib/x2goadminserver.pm b/x2goadminserver/lib/x2goadminserver.pm new file mode 100644 index 0000000..20bdc9b --- /dev/null +++ b/x2goadminserver/lib/x2goadminserver.pm @@ -0,0 +1,79 @@ +# Copyright (C) 2010-2011 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2010-2011 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> + +# X2go Admin Server is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# X2go Admin Server is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, see <http://www.gnu.org/licenses/> +# or write to +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +use Config::Simple; +package x2goadminserver; +use strict; + +my $Config = new Config::Simple(syntax=>'ini'); +$Config->read('/etc/x2go/x2goadminserver.conf' ) or die "Could not be read: /etc/x2go/x2goadminserver.conf"; +my $backend=$Config->param("backend"); +use lib "/usr/lib/x2go"; + +if($backend eq "cipux" ) +{ + use x2goadminserver_backend_cipux; +} + + +use base 'Exporter'; +our @EXPORT=('x2goadmin_getUsers','x2goadmin_getGroups', 'x2goadmin_getGroupsOfUser','x2goadmin_getGroupsWithUsers', + 'x2goadmin_modifyUser', 'x2goadmin_addUser','x2goadmin_modifyGroup', + 'x2goadmin_addGroup' ,'x2goadmin_removeUsers','x2goadmin_removeGroups'); + + +sub x2goadmin_getUsers { + return getUsers(@_); +} + +sub x2goadmin_getGroups { + return getGroups(@_); +} + +sub x2goadmin_getGroupsWithUsers { + return getGroupsWithUsers(@_); +} + +sub x2goadmin_getGroupsOfUser { + return getGroupsOfUser(@_); +} + +sub x2goadmin_modifyUser { + return modifyUser(@_); +} + +sub x2goadmin_modifyGroup { + return modifyGroup(@_); +} + +sub x2goadmin_addGroup { + return addGroup(@_); +} + +sub x2goadmin_addUser { + return addUser(@_); +} + +sub x2goadmin_removeUsers { + return removeUsers(@_); +} + +sub x2goadmin_removeGroups { + return removeGroups(@_); +} diff --git a/x2goadminserver/x2gocipux.pm b/x2goadminserver/lib/x2goadminserver_backend_cipux.pm similarity index 92% rename from x2goadminserver/x2gocipux.pm rename to x2goadminserver/lib/x2goadminserver_backend_cipux.pm index 3d76875..46d7d6e 100644 --- a/x2goadminserver/x2gocipux.pm +++ b/x2goadminserver/lib/x2goadminserver_backend_cipux.pm @@ -1,4 +1,23 @@ -package x2gocipux; +# Copyright (C) 2010-2011 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2010-2011 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> + +# X2go Admin Server is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# X2go Admin Server is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, see <http://www.gnu.org/licenses/> +# or write to +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +package x2goadminserver_backend_cipux; use strict; use Config::Simple; use CipUX::RPC::Client; @@ -6,8 +25,8 @@ use English qw( -no_match_vars); my $Config = new Config::Simple(syntax=>'ini'); -$Config->read('/etc/x2go/x2goadminserver' ) or die "/etc/x2go/x2goadminserver"; -my $url=$Config->param("x2gocipux.url"); +$Config->read('/etc/x2go/x2goadminserver.conf' ) or die "/etc/x2go/x2goadminserver.conf"; +my $url=$Config->param("cipux_backend.url"); #my $client='rpc_x2go_cipux'; my $client='expl_rpc_task_list'; diff --git a/x2goadminserver/man/man5/x2goadminserver.conf.5 b/x2goadminserver/man/man5/x2goadminserver.conf.5 new file mode 100644 index 0000000..894a267 --- /dev/null +++ b/x2goadminserver/man/man5/x2goadminserver.conf.5 @@ -0,0 +1,22 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goadminserver.conf 5 "Sep 2011" "Version 0.0.0.x" "X2go Administration Server" +.SH NAME +x2goadminserver.conf \- X2go Admin Server Configuration File +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2goadminserver.conf\fR is the configuration file of the X2go Administration Server. + +.SH DESCRIPTION +\fBx2goadminserver.conf\fR needs to be documented here. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goadminserver/man/man8/x2gorpcserver.cgi.8 b/x2goadminserver/man/man8/x2gorpcserver.cgi.8 new file mode 100644 index 0000000..fd90110 --- /dev/null +++ b/x2goadminserver/man/man8/x2gorpcserver.cgi.8 @@ -0,0 +1,22 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gorpcserver.cgi 8 "Sep 2011" "Version 0.0.0.x" "X2go Administration Server" +.SH NAME +x2gorpcserver.cgi \- X2go Admin Server / RPC Server Script +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2gorpcserver.cgi\fR + +.SH DESCRIPTION +\fBx2gorpcserver.cgi\fR is a CGI script and a component of the X2go Administration Server. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goadminserver/x2goadminserver b/x2goadminserver/x2goadminserver deleted file mode 100644 index eaa96f7..0000000 --- a/x2goadminserver/x2goadminserver +++ /dev/null @@ -1,5 +0,0 @@ -backend=x2gocipux - -[x2gocipux] -url=http://localhost:8001/RPC2 - diff --git a/x2goadminserver/x2goadminserver.pm b/x2goadminserver/x2goadminserver.pm deleted file mode 100644 index e44e4df..0000000 --- a/x2goadminserver/x2goadminserver.pm +++ /dev/null @@ -1,60 +0,0 @@ -use Config::Simple; -package x2goadminserver; -use strict; - -my $Config = new Config::Simple(syntax=>'ini'); -$Config->read('/etc/x2go/x2goadminserver' ) or die "/etc/x2go/x2goadminserver"; -my $backend=$Config->param("backend"); -use lib "/usr/lib/x2go"; - -if($backend eq "x2gocipux" ) -{ - use x2gocipux; -} - - -use base 'Exporter'; -our @EXPORT=('x2goadmin_getUsers','x2goadmin_getGroups', 'x2goadmin_getGroupsOfUser','x2goadmin_getGroupsWithUsers', - 'x2goadmin_modifyUser', 'x2goadmin_addUser','x2goadmin_modifyGroup', - 'x2goadmin_addGroup' ,'x2goadmin_removeUsers','x2goadmin_removeGroups'); - - -sub x2goadmin_getUsers { - return getUsers(@_); -} - -sub x2goadmin_getGroups { - return getGroups(@_); -} - -sub x2goadmin_getGroupsWithUsers { - return getGroupsWithUsers(@_); -} - -sub x2goadmin_getGroupsOfUser { - return getGroupsOfUser(@_); -} - -sub x2goadmin_modifyUser { - return modifyUser(@_); -} - -sub x2goadmin_modifyGroup { - return modifyGroup(@_); -} - -sub x2goadmin_addGroup { - return addGroup(@_); -} - -sub x2goadmin_addUser { - return addUser(@_); -} - -sub x2goadmin_removeUsers { - return removeUsers(@_); -} - -sub x2goadmin_removeGroups { - return removeGroups(@_); -} hooks/post-receive -- x2goadmincenter.git (X2go Administration Center) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goadmincenter.git" (X2go Administration Center).