Changes to 'refs/tags/spacewalk-setup-0.7.1-1'
by Milan Zazrivec
Tag 'spacewalk-setup-0.7.1-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2009-08-28 16:02 +0000
Tagging package [spacewalk-setup] version [0.7.1-1] in directory [spacewalk/setup/].
Changes since spacewalk-config-0.7.1-1:
Milan Zazrivec (1):
Automatic commit of package [spacewalk-setup] release [0.7.1-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
---
14 years, 7 months
Changes to 'refs/tags/spacewalk-config-0.7.1-1'
by Milan Zazrivec
Tag 'spacewalk-config-0.7.1-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2009-08-28 16:01 +0000
Tagging package [spacewalk-config] version [0.7.1-1] in directory [spacewalk/config/].
Changes since spacewalk-web-0.7.2-1:
Milan Zazrivec (4):
add spacewalk-setup-jabberd script
removed all jabberd prep config files
No need to pre-require jabberd
Automatic commit of package [spacewalk-config] release [0.7.1-1].
---
rel-eng/packages/spacewalk-config | 2
spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/c2s.xml | 587 --------
spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/router-users.xml | 11
spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/router.xml | 201 --
spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/s2s.xml | 281 ---
spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/sm.xml | 719 ----------
spacewalk/config/spacewalk-config.spec | 10
spacewalk/setup/Makefile.PL | 2
spacewalk/setup/bin/spacewalk-setup | 24
spacewalk/setup/bin/spacewalk-setup-jabberd | 88 +
spacewalk/setup/share/jabberd/c2s.xsl | 27
spacewalk/setup/share/jabberd/s2s.xsl | 34
spacewalk/setup/share/jabberd/sm.xsl | 17
spacewalk/setup/spacewalk-setup.spec | 3
14 files changed, 190 insertions(+), 1816 deletions(-)
---
14 years, 7 months
2 commits - rel-eng/packages spacewalk/config spacewalk/setup
by Milan Zazrivec
rel-eng/packages/spacewalk-config | 2 +-
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/config/spacewalk-config.spec | 7 ++++++-
spacewalk/setup/spacewalk-setup.spec | 9 ++++++++-
4 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit 725e768e3860d2a8b9a15fc343b03c7a3812a2b8
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Aug 28 18:02:45 2009 +0200
Automatic commit of package [spacewalk-setup] release [0.7.1-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index d9a9b45..284be8a 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-0.6.20-1 spacewalk/setup/
+0.7.1-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 1e9ae3c..eb01774 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 0.7.0
+Version: 0.7.1
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -105,6 +105,13 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/pki/spacewalk/jabberd
%changelog
+* Fri Aug 28 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 0.7.1-1
+- add spacewalk-setup-jabberd script (mzazrivec(a)redhat.com)
+- bumping Version to 0.7.0 (jmatthew(a)redhat.com)
+- As /usr/bin/spacewalk-setup calls /usr/bin/gpg, we should Require it.
+ (jpazdziora(a)redhat.com)
+- fix missing column name (mzazrivec(a)redhat.com)
+
* Thu Aug 06 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 0.6.20-1
- update spacewalk / satellite monitoring scout ip address
commit a9fe78b9818b7d7addf8df2456743887eaa1baab
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Aug 28 18:01:48 2009 +0200
Automatic commit of package [spacewalk-config] release [0.7.1-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config
index d509530..5dba092 100644
--- a/rel-eng/packages/spacewalk-config
+++ b/rel-eng/packages/spacewalk-config
@@ -1 +1 @@
-0.6.13-1 spacewalk/config/
+0.7.1-1 spacewalk/config/
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index dcf399a..5d09248 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -2,7 +2,7 @@
Name: spacewalk-config
Summary: Spacewalk Configuration
-Version: 0.7.0
+Version: 0.7.1
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -95,6 +95,11 @@ EOF
%changelog
+* Fri Aug 28 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 0.7.1-1
+- No need to pre-require jabberd (mzazrivec(a)redhat.com)
+- removed all jabberd prep config files (mzazrivec(a)redhat.com)
+- bumping versions to 0.7.0 (jmatthew(a)redhat.com)
+
* Wed Jul 29 2009 Devan Goodwin <dgoodwin(a)redhat.com> 0.6.13-1
- Add router.xml and router-users.xml to jabberd configs we deploy.
(dgoodwin(a)redhat.com)
14 years, 7 months
3 commits - spacewalk/config spacewalk/setup
by Milan Zazrivec
spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/c2s.xml | 587 --------
spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/router-users.xml | 11
spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/router.xml | 201 --
spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/s2s.xml | 281 ---
spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/sm.xml | 719 ----------
spacewalk/config/spacewalk-config.spec | 3
spacewalk/setup/Makefile.PL | 2
spacewalk/setup/bin/spacewalk-setup | 24
spacewalk/setup/bin/spacewalk-setup-jabberd | 88 +
spacewalk/setup/share/jabberd/c2s.xsl | 27
spacewalk/setup/share/jabberd/s2s.xsl | 34
spacewalk/setup/share/jabberd/sm.xsl | 17
spacewalk/setup/spacewalk-setup.spec | 3
13 files changed, 183 insertions(+), 1814 deletions(-)
New commits:
commit 03019f7e550c44df1a8b667f205fc361fbd343aa
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Aug 28 17:56:38 2009 +0200
No need to pre-require jabberd
This was needed only so that spacewalk-config post installation scripts
could configure <pass/> in existing jabberd configuration. Everything
jabberd related is now configured via spacewalk-setup-jabberd.
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index 109c5c3..dcf399a 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -18,8 +18,6 @@ Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
-# this is so we can set the password consistently across all jabberd configs
-Requires(pre): jabberd
# We need package httpd to be able to assign group apache in files section
Requires: httpd
commit 2abe760dcc56dfc4d4fa7ff100a62de6b788d24c
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Aug 28 17:54:50 2009 +0200
removed all jabberd prep config files
These are no longer needed here since we use spacewalk-setup-jabberd
to configure jabberd.
diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/c2s.xml b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/c2s.xml
deleted file mode 100644
index b069296..0000000
--- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/c2s.xml
+++ /dev/null
@@ -1,587 +0,0 @@
-<!-- c2s configuration -->
-<c2s>
- <!-- Our ID on the network (default: c2s) -->
- <id>c2s</id>
-
- <!-- The process ID file. Comment this out if you don't need to know
- the process ID from outside the process (eg for control scripts) -->
- <pidfile>/var/lib/jabberd/pid/c2s.pid</pidfile>
-
- <!-- Router connection configuration -->
- <router>
- <!-- IP/port the router is waiting for connections on -->
- <ip>127.0.0.1</ip> <!-- default: 127.0.0.1 -->
- <port>5347</port> <!-- default: 5347 -->
-
- <!-- Username/password to authenticate as -->
- <user>jabberd</user> <!-- default: jabberd -->
- <pass>@@jabberDOTdbpass@@</pass> <!-- default: secret -->
-
- <!-- File containing an SSL certificate and private key to use when
- setting up an encrypted channel with the router. From
- SSL_CTX_use_certificate_chain_file(3): "The certificates must be
- in PEM format and must be sorted starting with the subject's
- certificate (actual client or server certificate), followed
- by intermediate CA certificates if applicable, and ending
- at the highest level (root) CA" (the latter one being optional).
- If this is commented out, or the file can't be read, no attempt
- will be made to establish an encrypted channel with the router. -->
- <!--
- <pemfile>/etc/pki/spacewalk/jabberd/server.pem</pemfile>
- -->
-
- <!-- Router connection retry -->
- <retry>
- <!-- If the connection to the router can't be established at
- startup, we should try again this many times before exiting.
- Use -1 to retry indefinitely. [default: 3] -->
- <init>3</init>
-
- <!-- If we lost the connection to the router during normal
- operation (ie we've successfully connected to the router in
- the past), we should try to reconnect this many times before
- exiting. Use -1 to retry indefinitely. [default: 3] -->
- <lost>3</lost>
-
- <!-- Sleep for this many seconds before trying attempting a
- reconnect. [default: 2] -->
- <sleep>2</sleep>
- </retry>
- </router>
-
- <!-- Log configuration - type is "syslog", "file" or "stdout" -->
- <log type='syslog'>
- <!-- If logging to syslog, this is the log ident -->
- <ident>jabberd/c2s</ident>
-
- <!-- If logging to syslog, this is the log facility
- (local0 - local7) [default: local3] -->
- <facility>local3</facility>
-
- <!-- If logging to file, this is the filename of the logfile -->
- <!--
- <file>/var/lib/jabberd/log/c2s.log</file>
- -->
- </log>
-
- <!-- Local network configuration -->
- <local>
- <!-- Who we identify ourselves as. This should correspond to the
- ID (host) that the session manager thinks it is. You can
- specify more than one to support virtual hosts, as long as you
- have additional session manager instances on the network to
- handle those hosts.
-
- You may leave the content of the <id/> empty to setup default
- virtual host setup, that will be used for all present but not
- configured otherwise SM domains.
-
- realm
- attribute specifies the auth/reg or SASL authentication realm
- for the host. If the attribute is not specified, the realm will
- be selected by the SASL mechanism, or will be the same as the ID
- itself. Be aware that users are assigned to a realm, not a host,
- so two hosts in the same realm will have the same users. If no
- realm is specified, it will be set to be the same as the ID.
- If empty "" realm is specified, the PAM backend wil authenticate
- using plain usernames, not JIDs.
-
- pemfile
- attribute specifies the file containing a SSL certificate and
- private key for client connections. If this is non existant,
- clients will not be offered the STARTTLS stream extension
- From SSL_CTX_use_certificate_chain_file(3):
- "The certificates must be in PEM format and must be sorted
- starting with the subject's certificate (actual client or server
- certificate), followed by intermediate CA certificates if
- applicable, and ending at the highest level (root) CA"
- (the latter one being optional).
-
- verify-mode
- SSL verify mode - see SSL_CTX_set_verify(3), mode parameter
-
- require-starttls
- If this is enabled, clients must do STARTTLS
- before they can authenticate. Until the stream is encrypted,
- all packets will be dropped.
-
- register-enable
- Remove this attribute to disable account registrations.
-
- instructions
- Human-readable instructions to be returned to client when
- registration is requested.
-
- register-oob
- URL to be attached as an alternative, out-of-band registration
- method. Usually web-based http:// URL.
-
- password-change
- Password change only. When registration is disabled, it may
- still be useful to allow clients to change their password. If
- you want this, add this attribute when you disable registration.
- -->
- <id realm='' register-enable='true' require-starttls='false' pemfile='/etc/pki/spacewalk/jabberd/server.pem'>@@jabberDOThostname@@</id>
- <!-- or
- <id realm='company.int'
- pemfile='/etc/pki/spacewalk/jabberd/server.pem'
- verify-mode='7'
- require-starttls='true'
- register-enable='true'
- instructions='Enter a username and password to register with this server.'
- register-oob='http://example.org/register'
- password-change='true'
- >example.net</id> -->
- <!-- or the default host
- <id password-change='true' /> -->
-
- <!-- IP address to bind to (default: 0.0.0.0) -->
- <ip>0.0.0.0</ip>
-
- <!-- Port to bind to, or 0 to disable unencrypted access to the
- server (default: 5222) -->
- <port>5222</port>
-
- <!-- Older versions of jabberd support encrypted client connections
- via an additional listening socket on port 5223. If you want
- this (required to allow pre-STARTTLS clients to do SSL),
- uncomment this -->
- <!--
- <ssl-port>5223</ssl-port>
- -->
-
- <!-- File containing an SSL certificate and private key for client
- connections. From SSL_CTX_use_certificate_chain_file(3):
- "The certificates must be in PEM format and must be sorted
- starting with the subject's certificate (actual client or server
- certificate), followed by intermediate CA certificates if
- applicable, and ending at the highest level (root) CA"
- (the latter one being optional).
-
- Note: This certificate is ONLY used for old style SSL
- connections on port 5223 (pre-STARTTLS). If you want to
- use STARTTLS over the standard XMPP port 5222 then you
- MUST specify the pemfile in the 'id' tag above. -->
- <!--
- <pemfile>/etc/pki/spacewalk/jabberd/server.pem</pemfile>
- -->
-
- <!-- SSL verify mode - see SSL_CTX_set_verify(3), mode parameter -->
- <!--
- <verify-mode>7</verify-mode>
- -->
-
- <!-- Forward incoming HTTP clients to a real HTTP server -->
- <!--
- <httpforward>http://www.jabber.org/</httpforward>
- -->
- </local>
-
- <!-- Input/output settings -->
- <io>
- <!-- Maximum number of file descriptors. This value sets an upper
- limit on the number of users who may be logged in to this
- server at a given time. Each user consumers one file
- descriptor.
-
- Note that the number of possible connections will be slightly
- less than this, because c2s itself can use up five on its own,
- and auth/reg modules may need a few also. If the supply of
- file descriptors is exhausted, new incoming connections will
- be denied.
-
- Also note that this value only affects how many file descriptors
- jabberd is able to handle internally. You may also need to
- tell your operating system to allow jabberd to use more file
- descriptors. On Linux this can be done using ulimit -n or by
- changing the value of /proc/sys/fd/file-max.
-
- (default: 1024) -->
- <max_fds>1024</max_fds>
-
- <!-- Rate limiting -->
- <limits>
- <!-- Maximum bytes per second - if more than X bytes are sent in Y
- seconds, connection is throttled for Z seconds. The format
- is:
-
- <bytes seconds='Y' throttle='Z'>X</bytes>
-
- Default Y is 1, default Z is 5. set X to 0 to disable. -->
- <bytes>0</bytes>
-
- <!-- Maximum number of stanzas per second - if more than X stanzas
- are sent in Y seconds, connection is throttled for Z seconds.
- The format is:
-
- <stanzas seconds='Y' throttle='Z'>X</stanzas>
-
- Default Y 1, default Z is 5. Set X to 0 to disable -->
- <stanzas>1000</stanzas>
-
- <!-- Maximum connects per second - if more than X connects are
- attempted from a single IP in Y seconds, that IP is throttled
- for Z seconds. The format is:
-
- <connects seconds='Y' throttle='Z'>X</connects>
-
- Default Y is 5, default Z is 5. set X to 0 to disable. -->
- <connects>0</connects>
-
- <!-- Maximum stanza size - if more than given number of bytes
- are read in one incoming stanza, the stream is closed
- with policy-violation error.
-
- Set to 0 to disable.
- Values less than 16384 might not work. -->
- <stanzasize>65535</stanzasize>
- </limits>
-
- <!-- Enable XEP-0138: Stream Compression -->
- <!--
- <compression/>
- -->
-
- <!-- IP-based access controls. If a connection IP matches an allow
- rule, the connection will be accepted. If a connecting IP
- matches a deny rule, the connection will be refused. If the
- connecting IP does not match any rules, or it matches both an
- allow and a deny rule, the contents of the <order/> option
- determines what happens. -->
- <access>
- <!-- Rule check order (default: allow,deny)
-
- allow,deny - Check allow rules, then check deny rules.
- Allow by default.
- deny,allow - Check deny rules, then check allow rules.
- Deny by default. -->
- <order>allow,deny</order>
-
- <!-- Allow a network. If the mask isn't specified, it defaults to
- 255.255.255.255 (ie allow onle the specified IP) -->
- <!--
- <allow ip='127.0.0.0' mask='255.0.0.0'/>
- -->
-
- <!-- Allow a single host -->
- <!--
- <allow ip='12.34.56.78'/>
- -->
-
- <!-- Deny a network or a host -->
- <!--
- <deny ip='127.0.0.1' mask='255.0.0.0'/>
- <deny ip='87.65.43.21'/>
- -->
- </access>
-
- <!-- Timed checks -->
- <check>
- <!-- Interval between checks.
-
- Open client connections will be checked every n seconds, and
- the following checks applied.
-
- 0 disables all checks. (default: 0) -->
- <interval>0</interval>
-
- <!-- Idle connection checks.
-
- Connections that have not sent data for longer than this many
- seconds will be dropped.
-
- 0 disables idle timeouts. (default: 0) -->
- <idle>0</idle>
-
- <!-- Keepalives.
-
- Connections that have not sent data for longer than this many
- seconds will have a single whitespace character sent to them.
- This will force the TCP connection to be closed if they have
- disconnected without us knowing about it.
-
- 0 disables keepalives. (default: 0) -->
- <keepalive>0</keepalive>
-
- </check>
-
- </io>
-
- <!-- Statistics -->
- <stats>
- <!-- file containing count of packets that went through -->
- <!--
- <packet>/var/lib/jabberd/stats/c2s.packets</packet>
- -->
- </stats>
-
- <!-- Authentication/registration database configuration -->
- <authreg>
- <!-- Dynamic authreg modules path -->
- <path>@@jabberDOTlibdir@@</path>
-
- <!-- Backend module to use -->
- <module>db</module>
-
- <!-- Available authentication mechanisms -->
- <mechanisms>
-
- <!-- These are the traditional Jabber authentication mechanisms.
- Comment out any that you don't want to be offered to clients.
- Note that if the auth/reg module does not support one of
- these mechanisms, then it will not be offered regardless of
- whether or not it is enabled here. -->
- <traditional>
- <plain/>
- <digest/>
- </traditional>
-
- <!-- SASL authentication mechanisms. Comment out any that you
- don't want to be offered to clients. Again, if the auth/reg
- module does not support one of these mechanisms, then it will
- not be offered. -->
- <sasl>
- <plain/>
- <digest-md5/>
- <!--
- <anonymous/>
- <gssapi/>
- -->
- </sasl>
-
- </mechanisms>
-
- <!-- Additional mechanisms that are also available when the
- connection is encrypted. Ie. when START-TLS had been
- negotiated, or user connected on SSL-wrapped port. -->
- <ssl-mechanisms>
-
- <!-- it's advisable that you disable plain in the above
- <mechanisms/> section -->
- <traditional>
- <plain/>
- </traditional>
-
- <sasl>
- <plain/>
- </sasl>
-
- </ssl-mechanisms>
-
- <!-- MySQL module configuration -->
- <mysql>
- <!-- Database server host and port -->
- <host>localhost</host>
- <port>3306</port>
-
- <!-- Database name -->
- <dbname>jabberd2</dbname>
-
- <!-- Database username and password -->
- <user>jabberd2</user>
- <pass>@@jabberDOTdbpass@@</pass>
-
- <!-- Passwords in DB may be stored in plain or hashed format -->
- <!-- NOTE: If you are using hashed passwords, the only auth
- method that will work is PLAIN.
- Make sure that you disabled others in 'mechanisms'
- sections of the config file. -->
- <password_type>
- <!-- only one may be enabled here -->
- <plaintext/>
- <!-- use crypt(3)ed passwords
- <crypt/>
- -->
- </password_type>
- </mysql>
-
- <!-- PostgreSQL module configuration -->
- <pgsql>
- <!-- PostgreSQL connection info.
- For the rest of the options see
- http://www.postgresql.org/docs/8.0/interactive/libpq.html -->
- <conninfo>dbname=jabberd2 user=jabberd2 password=secret</conninfo>
-
- <!-- Alternatively you may set connection settings separately.
- These are used only in absence of 'conninfo' -->
-
- <!-- Database server host and port -->
- <host>localhost</host>
- <port>5432</port>
-
- <!-- Database name -->
- <dbname>jabberd2</dbname>
-
- <!-- Database username and password -->
- <user>jabberd2</user>
- <pass>@@jabberDOTdbpass@@</pass>
- </pgsql>
-
- <!-- Oracle driver configuration -->
- <oracle>
- <!-- Database server host and port. -->
- <host>localhost</host>
- <port>1521</port>
-
- <!-- Database name -->
- <dbname>jabberd2</dbname>
-
- <!-- Database username and password -->
- <user>jabberd2</user>
- <pass>@@jabberDOTdbpass@@</pass>
- </oracle>
-
- <!-- SQLite driver configuration -->
- <sqlite>
- <!-- Database name -->
- <dbname>/var/lib/jabberd/db/sqlite.db</dbname>
-
- <!-- Transacation support. If this is commented out, transactions
- will be disabled. This might make database accesses faster,
- but data may be lost if jabberd crashes. -->
- <transactions/>
-
- <!-- SQLite busy-timeout in milliseconds. -->
- <busy-timeout>2000</busy-timeout>
- </sqlite>
-
- <!-- Berkeley DB module configuration -->
- <db>
- <!-- Directory to store database files under -->
- <path>/var/lib/jabberd/db</path>
-
- <!-- Synchronize the database to disk after each write. If you
- disable this, database accesses may be faster, but data may
- be lost if jabberd crashes. -->
- <sync/>
- </db>
-
- <!-- LDAPFULL module configuration -->
- <ldapfull>
- <!-- LDAP server host and port (default: 389) -->
- <uri>ldap://localhost/ ldaps://ldap.example.com/</uri>
-
- <!-- DN to bind as for searches. If unspecified, the searches
- will be done anonymously. -->
- <!--
- <binddn>cn=Directory Manager</binddn>
- <bindpw>secret</bindpw>
- -->
-
- <!-- Type of LDAP server. Currently "ad" for active directory and "ldap"
- for other ldap servers. If not specified, then it is ldap. -->
- <!--
- <type>ad</type>
- -->
-
- <!-- LDAP attribute that holds the user ID (default: uid) -->
- <uidattr>uid</uidattr>
- <objectclass>posixAccount</objectclass>
- <pwattr>userPassword</pwattr>
- <!-- if you use included jabberd.schema use this:
- <uidattr>jid</uidattr>
- <objectclass>jabberUser</objectclass>
- <pwattr>jabberPassword</pwattr>
- -->
-
- <!-- Attribute that holds jabber account status. Must be TRUE for AD,
- and 1 for other LDAP server.
- If not specified, then it will not be used. -->
- <!--
- <validattr>valid</validattr>
- -->
- <fulluid/>
- <!-- If pwscheme is not defined, then passwords are stored in clear
- text and digest authentication may be done.
- If passwords are hashed, then you cannot use digest authentication
- and should use plain text authentication.
- For now, sha, ssha and plain may be specified -->
- <!-- <pwscheme>ssha</pwscheme> -->
-
- <!-- base DN of the tree. You should specify a DN for each
- authentication realm declared in the <local/> section above,
- by using the realm attribute. -->
- <basedn realm='company'>o=Company.com</basedn>
- <basedn>o=Example Corp.</basedn>
- </ldapfull>
-
- <!-- LDAP module configuration -->
- <!-- Remember that you need to use PLAIN auth with LDAP backend -->
- <ldap>
- <!-- LDAP server host and port (default: 389) -->
- <host>ldap.example.com</host>
- <port>389</port>
-
- <!-- Use LDAP v3 if possible. If disabled, v2 will be used.
- Encryption options are only available if v3 is enabled. -->
- <!--
- <v3/>
- -->
-
- <!-- Encryption. If enabled, this will create an encrypted channel
- to the LDAP server using the LDAP STARTTLS mechanism. -->
- <!--
- <starttls/>
- -->
-
- <!-- Encryption. If enabled, this will create an encrypted channel
- to the server using the old-style "ldaps://" mechanism. It is
- recommended that you use <starttls/> instead of this. -->
- <!--
- <ssl/>
- -->
-
- <!-- DN to bind as for searches. If unspecified, the searches
- will be done anonymously. -->
- <!--
- <binddn>cn=Directory Manager</binddn>
- <bindpw>secret</bindpw>
- -->
-
- <!-- LDAP attribute that holds the user ID (default: uid) -->
- <uidattr>uid</uidattr>
-
- <!-- Enable the append-realm element if you want to append
- realm value (usernam@realm) to the uidattr value
- <append-realm/>
- -->
-
- <!-- Alternatively to <uidattr/> and <append-realm/> you may
- specify full LDAP search <query/> that will be used to
- get user objects from directory.
-
- The following replacements take place:
- %u is replaced by user login name
- %r is replaced by user login realm
-
- When <query/> is specified, <uidattr/> and <append-realm/>
- are unused and take no effect. -->
- <!--
- <query>(&(mail=%u@%r)(objectClass=inetOrgPerson))</query>
- -->
-
- <!-- base DN of the tree. You should specify a DN for each
- authentication realm declared in the <local/> section above,
- by using the realm attribute. -->
- <basedn realm='company'>o=Company.com</basedn>
- <basedn>o=Example Corp.</basedn>
- </ldap>
- <!-- if you want to configure more than one LDAP server
- create ldap1, ldap2 etc. sections
- <ldap1>
-
- </ldap1>
- -->
-
- <!-- Pipe module configuration -->
- <pipe>
- <!-- Program to execute -->
- <exec>/usr/bin/pipe-auth.pl</exec>
- </pipe>
-
- </authreg>
-
-</c2s>
-<!--
- vim: syntax=xml
--->
diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/router-users.xml b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/router-users.xml
deleted file mode 100644
index d8da574..0000000
--- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/router-users.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- This is the list of known router users, and their authentication
- secrets. Access control is done via the settings in router.xml -->
-<users>
- <user>
- <name>jabberd</name>
- <secret>@@jabberDOTdbpass@@</secret>
- </user>
-</users>
-<!--
- vim: syntax=xml
--->
diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/router.xml b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/router.xml
deleted file mode 100644
index fa0a305..0000000
--- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/router.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<!-- Router configuration -->
-<router>
- <!-- ID of the router on the network (default: router) -->
- <id>router</id>
-
- <!-- The process ID file. Comment this out if you don't need to know
- the process ID from outside the process (eg for control scripts) -->
- <pidfile>/var/lib/jabberd/pid/router.pid</pidfile>
-
- <!-- Log configuration - type is "syslog", "file" or "stdout" -->
- <log type='syslog'>
- <!-- If logging to syslog, this is the log ident -->
- <ident>jabberd/router</ident>
-
- <!-- If logging to syslog, this is the log facility
- (local0 - local7) [default: local3] -->
- <facility>local3</facility>
-
- <!-- If logging to file, this is the filename of the logfile -->
- <!--
- <file>/var/lib/jabberd/log/router.log</file>
- -->
- </log>
-
- <!-- Local network configuration -->
- <local>
- <!-- IP address to bind to (default: 0.0.0.0) -->
- <ip>0.0.0.0</ip>
-
- <!-- Port to bind to (default: 5347) -->
- <port>5347</port>
-
- <!-- File containing the user table. This is where the router gets
- its component and secret information from for component
- authentication.-->
- <users>/etc/jabberd/router-users.xml</users>
-
- <!-- Shared secret used to identify XEP-0114 components (that is,
- "jabber:component:accept" components that authenticate using
- the Jabber Component Protocol's "handshake", for example
- mu-conference). If this is commented out, support for XEP-0114
- components will be disabled. -->
- <secret>@@jabberDOTdbpass@@</secret>
-
- <!-- File containing an SSL certificate and private key for client
- connections. From SSL_CTX_use_certificate_chain_file(3):
- "The certificates must be in PEM format and must be sorted
- starting with the subject's certificate (actual client or
- server certificate), followed by intermediate CA certificates
- if applicable, and ending at the highest level (root) CA"
- (the latter one being optional).
- If this is commented out, connecting components will not be able
- to request an SSL-encrypted channel. -->
- <!--
- <pemfile>/etc/jabberd/server.pem</pemfile>
- -->
- </local>
-
- <!-- Timed checks -->
- <check>
- <!-- Interval between checks.
-
- Checks will be run every n seconds.
-
- 0 disables all checks. (default: 60) -->
- <interval>60</interval>
-
- <!-- Keepalives.
- Connections that have not been used for longer than
- this many seconds will have a single whitespace character sent
- to them. This will force the TCP connection to be closed if
- they have disconnected without us knowing about it.
- 0 disables keepalives. (default: 0) -->
- <keepalive>0</keepalive>
-
- </check>
-
- <!-- input/output settings -->
- <io>
- <!-- Maximum number of file descriptors. Note that the number of
- possible connections will be slightly less than this, because
- the router itself can use up four on its own. If the supply of
- file descriptors is exhausted, new incoming connections will be
- denied.
-
- These file descriptors are really only used when a component
- connects to the router. So unless you have a lot of components
- for some reason then you probably don't need to change this
- value.
-
- (default: 1024) -->
- <max_fds>1024</max_fds>
-
- <!-- Rate limiting -->
- <limits>
- <!-- Maximum bytes per second - if more than X bytes are sent in Y
- seconds, connection is throttled for Z seconds. The format
- is:
-
- <bytes seconds='Y' throttle='Z'>X</bytes>
-
- Default Y is 1, default Z is 5. set X to 0 to disable. -->
- <bytes>0</bytes>
-
- <!-- Maximum connects per second - if more than X connects are
- attempted from a single IP in Y seconds, that IP is throttled
- for Z seconds. The format is:
-
- <connects seconds='Y' throttle='Z'>X</connects>
-
- Default Y is 5, default Z is 5. set X to 0 to disable. -->
- <connects>0</connects>
- </limits>
-
- <!-- IP-based access controls. If a connection IP matches an allow
- rule, the connection will be accepted. If a connecting IP
- matches a deny rule, the connection will be refused. If the
- connecting IP does not match any rules, or it matches both an
- allow and a deny rule, the contents of the <order/> option
- determines what happens. -->
- <access>
- <!-- Rule check order (default: allow,deny)
-
- allow,deny - Check allow rules, then check deny rules.
- Allow by default.
- deny,allow - Check deny rules, then check allow rules.
- Deny by default. -->
- <order>allow,deny</order>
-
- <!-- Allow a network. If the mask isn't specified, it defaults to
- 255.255.255.255 (ie allow onle the specified IP) -->
- <!--
- <allow ip='127.0.0.0' mask='255.0.0.0'/>
- -->
-
- <!-- Allow a single host -->
- <!--
- <allow ip='12.34.56.78'/>
- -->
-
- <!-- Deny a network or a host -->
- <!--
- <deny ip='127.0.0.1' mask='255.0.0.0'/>
- <deny ip='87.65.43.21'/>
- -->
- </access>
- </io>
-
- <!-- Name aliases.
-
- Packets destined for the domain specified in the "name" attribute
- will be routed to the component that has currently bound the name
- in the "target" attribute (assuming it is online).
-
- This is usually only required for some kinds of legacy
- components (particularly jabberd 1.4 "uplink" components) -->
- <aliases>
- <!-- Example for a MUC component running from a jabberd 1.4 uplink -->
- <!--
- <alias name='conference.domain.com' target='muclinker'/>
- -->
- </aliases>
-
- <!-- Access control information -->
- <aci>
- <!-- The usernames listed here will get access to all restricted
- functions, regardless of restrictions further down -->
- <acl type='all'>
- <user>jabberd</user>
- </acl>
-
- <!-- These users can bind names other than their username -->
- <!--
- <acl type='bind'>
- </acl>
- -->
-
- <!-- These users can bind a name as a default route -->
- <!--
- <acl type='default-route'>
- <user>s2s</user>
- </acl>
- -->
-
- <!-- These users can elect to receive all packets that pass through the router -->
- <!--
- <acl type='log'>
- <user>msglog</user>
- </acl>
- -->
-
- <!-- File containing packet filter rules.
- May be used for fine grained packet routing control. -->
- <filter>/etc/jabberd/router-filter.xml</filter>
-
- </aci>
-
-</router>
-<!--
- vim: syntax=xml
--->
diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/s2s.xml b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/s2s.xml
deleted file mode 100644
index 4f10c11..0000000
--- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/s2s.xml
+++ /dev/null
@@ -1,281 +0,0 @@
-<!-- s2s configuration -->
-<s2s>
- <!-- Our ID on the network (default: s2s) -->
- <id>s2s</id>
-
- <!-- The process ID file. comment this out if you don't need to know
- to know the process ID from outside the process (eg for control
- scripts) -->
- <pidfile>/var/lib/jabberd/pid/s2s.pid</pidfile>
-
- <!-- Router connection configuration -->
- <router>
- <!-- IP/port the router is waiting for connections on -->
- <ip>127.0.0.1</ip> <!-- default: 127.0.0.1 -->
- <port>5347</port> <!-- default: 5347 -->
-
- <!-- Username/password to authenticate as -->
- <user>jabberd</user> <!-- default: jabberd -->
- <pass>@@jabberDOTdbpass@@</pass> <!-- default: secret -->
-
- <!-- The router will only allow one component to be the default
- route (ie the component that receives packets destined for
- unknown hosts). If you want to run more than one s2s instance,
- you need to uncomment this so that s2s does not try to become
- the default route. Note that all outgoing s2s communication
- will go to the component that is the default route. -->
- <!--
- <non-default/>
- -->
-
- <!-- File containing a SSL certificate and private key to use when
- setting up an encrypted channel with the router. If this is
- commented out, or the file can't be read, no attempt will be
- made to establish an encrypted channel with the router. -->
- <!--
- <pemfile>/etc/pki/spacewalk/jabberd/server.pem</pemfile>
- -->
-
- <!-- Router connection retry -->
- <retry>
- <!-- If the connection to the router can't be established at
- startup, we should try again this many times before exiting.
- Use -1 to retry indefinitely. [default: 3] -->
- <init>3</init>
-
- <!-- If we lost the connection to the router during normal
- operation (ie we've successfully connected to the router in
- the past), we should try to reconnect this many times before
- exiting. Use -1 to retry indefinitely. [default: 3] -->
- <lost>3</lost>
-
- <!-- Sleep for this many seconds before trying attempting a
- reconnect. [default: 2] -->
- <sleep>2</sleep>
- </retry>
- </router>
-
- <!-- Log configuration - type is "syslog", "file" or "stdout" -->
- <log type='syslog'>
- <!-- If logging to syslog, this is the log ident -->
- <ident>jabberd/s2s</ident>
-
- <!-- If logging to syslog, this is the log facility
- (local0 - local7) [default: local3] -->
- <facility>local3</facility>
-
- <!-- if logging to file, this is the filename of the logfile -->
- <!--
- <file>/var/log/jabberd/s2s.log</file>
- -->
- </log>
-
- <!-- Local network configuration -->
- <local>
- <!-- IP and port to listen for incoming s2s connections on
- (default: 0.0.0.0, 5269) -->
- <ip>0.0.0.0</ip>
- <port>5269</port>
-
- <!-- Helper DNS resolver component - if this component is not
- connected, dialback connections will fail
- (default: resolver) -->
- <resolver>resolver</resolver>
-
- <!-- Secret used to generate dialback keys. If you have more than
- one s2s instance configured, make sure that this is the same on
- all of them. If this is commented out, a random one will be
- generated. -->
- <!--
- <secret>secret</secret>
- -->
-
- <!-- File containing an SSL certificate and private key to use when setting
- up encrypted s2s connections with other servers (STARTTLS + Dialback).
- From SSL_CTX_use_certificate_chain_file(3): "The certificates must be
- in PEM format and must be sorted starting with the subject's
- certificate (actual client or server certificate), followed
- by intermediate CA certificates if applicable, and ending
- at the highest level (root) CA" (the latter one being optional).
- If this is commented out, or the file can't be read, no attempt will be
- made to establish encrypted connections with other servers. -->
- <!--
- <pemfile>/etc/pki/spacewalk/jabberd/server.pem</pemfile>
- -->
-
- <!-- SSL verify mode - see SSL_CTX_set_verify(3), mode parameter -->
- <!--
- <verify-mode>7</verify-mode>
- -->
-
- <!-- File containing an optional SSL certificate chain file for SSL
- connections. -->
- <!--
- <cachain>/etc/pki/spacewalk/jabberd/cachain.pem</cachain>
- -->
-
- </local>
-
- <!-- input/output settings -->
- <io>
- <!-- Maximum number of file descriptors. Note that the number of
- possible connections will be slightly less than this, because
- s2s itself can use some on its own. If the supply of file
- descriptors is exhausted, new incoming connections will be
- denied.
-
- These connections are mainly consumed when we make a
- connection to an external jabber server, or an external jabber
- server connects to us. If you don't have a lot of users then
- there's probably no need for s2s to establish connections to
- external jabber servers and the default value here is probably
- fine. On the other hand, if you have lots of users with lots
- of remote buddies in their buddylist then s2s will need to have
- lots of open connections with other jabber servers and you may
- need to increase this value.
-
- Note that this value only affects how many file descriptors
- jabberd is able to handle internally. You may also need to
- tell your operating system to allow jabberd to use more file
- descriptors. On Linux this can be done using ulimit -n or by
- changing the value of /proc/sys/fd/file-max.
-
- (default: 1024) -->
- <max_fds>1024</max_fds>
-
- <!-- Rate limiting -->
- <limits>
- <!-- Maximum stanza size - if more than given number of bytes
- are read in one incoming stanza, the stream is closed
- with policy-violation error.
-
- Set to 0 to disable.
- Values less than 16384 might not work. -->
- <stanzasize>65535</stanzasize>
- </limits>
-
- </io>
-
- <!-- Timed checks -->
- <check>
- <!-- Interval between checks.
-
- Checks will be run every n seconds.
-
- 0 disables all checks. (default: 60) -->
- <interval>3</interval>
-
- <!-- Queue expiry and connection timeout.
-
- While a connection is being established and dialback is in
- progress, packets are queued. If a valid connection has not
- been established within this many seconds, the connection
- process will be aborted and the queued packets will be
- bounced. Timeout checks are made for three phases of
- setting up a route authenticated through dialback:
- 1. Connection establishment to exchange of stream headers
- 2. Initiating dialback (incoming connections)
- 3. Completing dialback (incoming and outgoing)
-
- If stage 1 connection establishment fails and there are
- alternative hosts for this route that have not failed
- recently, they will be tried too before finally giving up.
-
- 0 disables queue expiry. (default: 60) -->
- <queue>60</queue>
-
- <!-- Queue retry timeout.
-
- If the queue is older than this timeout, the connection
- will not be retried even if there are alternative hosts
- that have not failed recently.
-
- 0 disables retry expiry. (default: 300) -->
- <retry>300</retry>
-
- <!-- Idle connection checks.
-
- Connections that have not sent data for longer than this many
- seconds will be dropped.
-
- 0 disables idle timeouts. (default: 86400) -->
- <idle>86400</idle>
-
- <!-- Keepalives.
-
- Outgoing connections that have not been used for longer than
- this many seconds will have a single whitespace character sent
- to them. This will force the TCP connection to be closed if
- they have disconnected without us knowing about it.
-
- 0 disables keepalives. (default: 0) -->
- <keepalive>0</keepalive>
-
- <!-- Interval between DNS result/bad host expiry.
-
- 0 disables expiry checks. (default: 300) -->
- <dnscache>300</dnscache>
- </check>
-
- <!-- Statistics -->
- <stats>
- <!-- file containing count of packets that went through -->
- <!--
- <packet>/var/lib/jabberd/stats/s2s.packets</packet>
- -->
- </stats>
-
- <lookup>
- <!-- SRV TCP services will be resolved in the following order. The first
- one that returns something will be used (ie dereferenced via an
- A/AAAA lookup). If no SRV records are found, resolver will
- fallback to a straight A/AAAA lookup. -->
-
- <!-- xmpp-server is mandated by the XMPP spec -->
- <srv>xmpp-server</srv>
-
- <!-- traditionally, jabber has been used -->
- <srv>jabber</srv>
-
-
- <!-- If this is enabled, the resolver will look up AAAA records as well
- as A records. This is needed if you want s2s to use IPv6.
- Connection attempts will be made to all IPv6 hosts before trying
- IPv4 (see bad host timeout below). -->
- <!--
- <resolve-ipv6/>
- -->
-
- <!-- Minimum time that DNS lookup results are cached (overrides max below). -->
- <min-ttl>30</min-ttl>
-
- <!-- Maximum time that DNS lookup results are cached. -->
- <max-ttl>86400</max-ttl>
-
- <!-- Minimum time to wait before using hosts that we have failed to
- establish a connection to (unless there are no alternatives).
- Do not set this too low - it is required to detect permanent
- problems like broken IPv6 connectivity in order to attempt IPv4.
-
- 0 disables bad host caching. (default: 3600) -->
- <bad-host-timeout>3600</bad-host-timeout>
-
- <!-- Disable the DNS cache (negative caching will still be done).
- This is likely to negatively impact performance while saving
- a small amount of memory since multiple DNS requests must
- then be made for every re-connection. -->
- <!--
- <no-cache/>
- -->
- </lookup>
-
- <!-- If this is enabled, domains which share the same host will re-use
- existing outgoing connections. This is a potential security risk
- as the SSL connection from the first domain will be re-used too. -->
- <out-reuse-conn/>
-
-</s2s>
-<!--
- vim: syntax=xml
--->
-
diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/sm.xml b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/sm.xml
deleted file mode 100644
index 19ddb92..0000000
--- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/sm.xml
+++ /dev/null
@@ -1,719 +0,0 @@
-<!-- Session manager configuration -->
-<sm>
- <!-- Our ID on the network. Users will have this as the domain part of
- their JID. If you want your server to be accessible from other
- Jabber servers, this ID must be FQDN resolvable by DNSes -->
- <id>@@jabberDOThostname@@</id>
-
- <!-- The process ID file. Comment this out if you don't need to know
- the process ID from outside the process (eg for control scripts) -->
- <pidfile>/var/lib/jabberd/pid/sm.pid</pidfile>
-
- <!-- Router connection configuration -->
- <router>
- <!-- IP/port the router is waiting for connections on -->
- <ip>127.0.0.1</ip> <!-- default: 127.0.0.1 -->
- <port>5347</port> <!-- default: 5347 -->
-
- <!-- Username/password to authenticate as -->
- <user>jabberd</user> <!-- default: jabberd -->
- <pass>@@jabberDOTdbpass@@</pass> <!-- default: secret -->
-
- <!-- File containing an SSL certificate and private key to use when
- setting up an encrypted channel with the router. From
- SSL_CTX_use_certificate_chain_file(3): "The certificates must be
- in PEM format and must be sorted starting with the subject's
- certificate (actual client or server certificate), followed
- by intermediate CA certificates if applicable, and ending
- at the highest level (root) CA" (the latter one being optional).
- If this is commented out, or the file can't be read, no attempt
- will be made to establish an encrypted channel with the router. -->
- <!--
- <pemfile>/etc/pki/spacewalk/jabberd/server.pem</pemfile>
- -->
-
- <!-- Router connection retry -->
- <retry>
- <!-- If the connection to the router can't be established at
- startup, we should try again this many times before exiting.
- Use -1 to retry indefinitely. [default: 3] -->
- <init>3</init>
-
- <!-- If we lost the connection to the router during normal
- operation (ie we've successfully connected to the router in
- the past), we should try to reconnect this many times before
- exiting. Use -1 to retry indefinitely. [default: 3] -->
- <lost>3</lost>
-
- <!-- Sleep for this many seconds before trying attempting a
- reconnect. [default: 2] -->
- <sleep>2</sleep>
- </retry>
- </router>
-
- <!-- Log configuration - type is "syslog", "file" or "stdout" -->
- <log type='syslog'>
- <!-- If logging to syslog, this is the log ident -->
- <ident>jabberd/sm</ident>
-
- <!-- If logging to syslog, this is the log facility
- (local0 - local7) [default: local3] -->
- <facility>local3</facility>
-
- <!-- If logging to file, this is the filename of the logfile -->
- <!--
- <file>/var/lib/jabberd/log/sm.log</file>
- -->
- </log>
-
- <!-- Storage database configuration -->
- <storage>
- <!-- Dynamic storage modules path -->
- <path>@@jabberDOTlibdir@@</path>
-
- <!-- By default, we use the MySQL driver for all storage -->
- <driver>db</driver>
-
- <!-- Its also possible to explicitly list alternate drivers for
- specific data types. -->
-
- <!-- Store vcards in a ldapvcard database instead -->
- <!--
- <driver type='vcard'>ldapvcard</driver>
- -->
-
- <!-- Read mapping for group id <-> group name from ldap.
- Used by mod_published_roster.
- See ldapvcard section for options.
- When resolving group id to group name, it searches for
- groupsobjectclass objects at groupsdn base using group id
- (in groupsidattr) as key and returns the first value of
- groupattr of first found entry.
- E.g.. in general case, if group id is "some-dep", and groupsdn
- is o=org, and class is jabberGroup, it searches for
- (&(objectClass=jabberGroup)(cn=some-dep)) and returns value of
- jabberPublishedItem attribute, which may contain textual description.
- -->
- <!--
- <driver type='published-roster-groups'>ldapvcard</driver>
- -->
-
- <!-- MySQL driver configuration -->
- <mysql>
- <!-- Database server host and port -->
- <host>localhost</host>
- <port>3306</port>
-
- <!-- Database name -->
- <dbname>jabberd2</dbname>
-
- <!-- Database username and password -->
- <user>jabberd2</user>
- <pass>@@jabberDOTdbpass@@</pass>
-
- <!-- Transacation support. If this is commented out, transactions
- will be disabled. This might make database accesses faster,
- but data may be lost if jabberd crashes.
-
- This will need to be disabled if you are using a MySQL
- earlier than v3.23.xx, as transaction support did not appear
- until this version. -->
- <transactions/>
- </mysql>
-
- <!-- PostgreSQL driver configuration -->
- <pgsql>
- <!-- PostgreSQL connection info.
- For the rest of the options see
- http://www.postgresql.org/docs/8.0/interactive/libpq.html -->
- <conninfo>dbname=jabberd2 user=jabberd2 password=secret</conninfo>
-
- <!-- Alternatively you may set connection settings separately.
- These are used only in absence of 'conninfo' -->
-
- <!-- Database server host and port -->
- <host>localhost</host>
- <port>5432</port>
-
- <!-- Database name -->
- <dbname>jabberd2</dbname>
-
- <!-- Database username and password -->
- <user>jabberd2</user>
- <pass>@@jabberDOTdbpass@@</pass>
-
- <!-- Transacation support. If this is commented out, transactions
- will be disabled. This might make database accesses faster,
- but data may be lost if jabberd crashes. -->
- <transactions/>
- </pgsql>
-
- <!-- Berkeley DB driver configuration. This does not support roster
- maxitems or offline userquota (because the mod_roster
- implementation does not implement the 'count' callback). -->
- <db>
- <!-- Directory to store database files under -->
- <path>/var/lib/jabberd/db</path>
-
- <!-- Synchronize the database to disk after each write. If you
- disable this, database accesses may be faster, but data may
- be lost if jabberd crashes. -->
- <sync/>
- </db>
-
- <!-- Oracle driver configuration -->
- <oracle>
- <!-- Database server host and port. -->
- <host>localhost</host>
- <port>1521</port>
-
- <!-- Database name -->
- <dbname>jabberd2</dbname>
-
- <!-- Database username and password -->
- <user>jabberd2</user>
- <pass>@@jabberDOTdbpass@@</pass>
- </oracle>
-
- <!-- SQLite driver configuration -->
- <sqlite>
- <!-- Database name -->
- <dbname>/var/lib/jabberd/db/sqlite.db</dbname>
-
- <!-- Transacation support. If this is commented out, transactions
- will be disabled. This might make database accesses faster,
- but data may be lost if jabberd crashes. -->
- <transactions/>
-
- <!-- SQLite busy-timeout in milliseconds. -->
- <busy-timeout>2000</busy-timeout>
- </sqlite>
-
- <!-- Filesystem driver configuration -->
- <fs>
- <!-- Directory to store database files under. -->
- <path>/var/lib/lib/jabberd2/fs</path>
- </fs>
-
- <!-- LDAPVCARD driver configuration -->
- <ldapvcard>
- <!-- LDAP server host and port (default: 389) -->
- <uri>ldap://localhost/ ldaps://ldap.example.com/</uri>
-
- <!-- DN to bind as for searches. If unspecified, the searches
- will be done anonymously. -->
- <!--
- <binddn>cn=Directory Manager</binddn>
- <bindpw>secret</bindpw>
- -->
-
- <!-- see authreg.ldapfull int c2s.xml for description. -->
- <!--
- <type>ad</type>
- -->
-
- <!-- LDAP attribute that holds the user ID (default: uid) -->
- <uidattr>uid</uidattr>
- <objectclass>posixAccount</objectclass>
- <pwattr>userPassword</pwattr>
- <!-- if you use included jabberd.schema use this:
- <uidattr>jid</uidattr>
- <objectclass>jabberUser</objectclass>
- <pwattr>jabberPassword</pwattr>
- -->
-
- <!-- see authreg.ldapfull int c2s.xml for description. -->
- <!--
- <validattr>valid</validattr>
- -->
-
- <!-- base DN of the tree. You should specify a DN for each
- authentication realm declared in the <local/> section above,
- by using the realm attribute. -->
- <basedn>o=Example Corp.</basedn>
-
- <!-- attribute that holds published group name or id,
- jabberPublishedGroup if not set -->
- <!--
- <groupattr>jabberPublishedGroup</groupattr>
- -->
-
- <!-- boolean attribute that tells, publish or not this user
- jabberPublishedItem by default -->
- <!--
- <publishedattr>jabberPublishedItem</publishedattr>
- -->
-
- <!-- If value specified, then keep cache of "published-roster"
- database. Cache is renewed when kept more seconds than value
- specified. Setting this value increases perfomance of publishing
- roster. If not specified, then we don't keep cache. -->
- <publishedcachettl>60</publishedcachettl>
-
- <mapped-groups>
- <!-- If turned on, then reading mapping of group ids to names with
- LDAP will works. -->
- <!--
- <map-groups/>
- -->
-
- <!-- base for searches for group id to group name mappings -->
- <basedn>ou=jabbergroups, o=Example Corp.</basedn>
-
- <!-- what objectclass to search, jabberGroup by default -->
- <!--
- <objectclass>jabberGroup</objectclass>
- -->
-
- <!-- what attribute to search, cn by default -->
- <!--
- <idattr>cn</idattr>
- -->
-
- <!-- attribute with text group name, description by default -->
- <!--
- <nameattr>description</nameattr>
- -->
- </mapped-groups>
- </ldapvcard>
- </storage>
-
- <!-- Access control information -->
- <aci>
- <!-- The JIDs listed here will get access to all restricted
- functions, regardless of restrictions further down -->
- <acl type='all'>
- <jid>admin(a)localhost.localdomain</jid>
- </acl>
-
- <!-- These JIDs can send broadcast messages (announce, motd) -->
- <!--
- <acl type='broadcast'>
- <jid>nocstaff1(a)localhost.localdomain</jid>
- <jid>nocstaff2(a)localhost.localdomain</jid>
- </acl>
- -->
-
- <!-- These JIDs will receive messages addressed to the sm itself
- (help requestes and such) -->
- <!--
- <acl type='messages'>
- <jid>support(a)localhost.localdomain</jid>
- </acl>
- -->
-
- <!-- These JIDs can discover active user/session information -->
- <!--
- <acl type='disco'>
- <jid>webstatus(a)localhost.localdomain</jid>
- </acl>
- -->
- </aci>
-
- <!-- Module chain configuration
-
- Modules listed in a chain are called in the order specified at
- the appropriate time for that chain (assuming that the module
- knows how to work with that chain; otherwise it simply ignores
- it).
-
- Removing a module from these lists will stop the module being
- called, even if its compiled into the server.
-
- Serveral modules have a presence in more than one chain. It is
- possible to remove a module from one chain but not others, but
- this may cause strange behaviour. Make sure you know what you're
- doing. -->
- <modules>
- <!-- Dynamic sm modules path -->
- <path>@@jabberDOTlibdir@@</path>
-
- <!-- sess-start. The modules in this chain are called when a session
- is first started (usually on request by c2s as part of the
- authentication process). This is normally used to load
- per-session data. -->
- <chain id='sess-start'>
- <module>status</module> <!-- record status information -->
- </chain>
-
- <!-- sess-end. The modules in this chain are called just before a
- session is destroyed (after the client has disconnected). -->
- <chain id='sess-end'>
- <module>status</module> <!-- update status information -->
- <module>iq-last</module> <!-- update logout time -->
- </chain>
-
- <!-- in-sess. The modules in this chain are called when a packet
- arrives from an active user session. Note that this chain is
- also responsible for delivering packets to their destinations -
- this is usually handled by the "deliver" module. -->
- <chain id='in-sess'>
- <module>validate</module> <!-- validate packet type -->
- <module>status</module> <!-- update status information -->
- <module>privacy</module> <!-- manage privacy lists -->
- <module>roster</module> <!-- handle roster get/sets and s10ns -->
- <module>vacation</module> <!-- manage vacation settings -->
- <module>iq-vcard</module> <!-- store and retrieve the user's vcard -->
- <module>iq-ping</module> <!-- return the server ping -->
- <module>iq-private</module> <!-- manage the user's private data store -->
- <module>disco</module> <!-- respond to agents requests from sessions -->
- <module>amp</module> <!-- advanced message processing -->
- <module>offline</module> <!-- if we're coming online for the first time, deliver queued messages -->
- <module>announce</module> <!-- deliver motd -->
- <module>presence</module> <!-- process and distribute presence updates -->
- <module>deliver</module> <!-- deliver packets with full jids directly -->
- </chain>
-
- <!-- out-sess. The modules in this chain are called just before a
- packet is delivered to an active user session. -->
- <chain id='out-sess'/>
-
- <!-- in-router. The modules in this chain are called when a packet
- arrives from the router (ie another component or s2s), but
- before any processing is done. This is a good place to filter
- incoming packets. -->
- <chain id='in-router'>
- <module>session</module> <!-- perform session actions as required by c2s -->
- <module>validate</module> <!-- validate packet type -->
- <module>presence</module> <!-- drop incoming presence if user not online -->
- <module>privacy</module> <!-- filter incoming packets based on privacy rules -->
- </chain>
-
- <!-- out-router. The modules in this chain are called just before a
- packet is delivered to the router (destined for another
- component or s2s). This is a good place to filter outgoing
- packets. -->
- <chain id='out-router'>
- <module>privacy</module> <!-- filter outgoing packets based on privacy rules -->
- </chain>
-
- <!-- pkt-sm. The modules in this chain are called when a packet
- arrives that is addressed to the session manager itself (ie the
- to JID has no node part). This is normally used to provide
- session-manager-wide services (like service discovery). -->
- <chain id='pkt-sm'>
- <module>iq-last</module> <!-- return the server uptime -->
- <module>iq-ping</module> <!-- return the server ping -->
- <module>iq-time</module> <!-- return the current server time -->
- <module>iq-version</module> <!-- return the server name and version -->
- <module>amp</module> <!-- advanced message processing -->
- <module>disco</module> <!-- build the disco list; respond to disco queries -->
- <module>announce</module> <!-- send broadcast messages (announce, motd, etc) -->
- <module>help</module> <!-- resend sm messages to administrators -->
- <module>echo</module> <!-- echo messages sent to /echo -->
- <module>status</module> <!-- track status information -->
- <module>presence</module> <!-- proces server presence subscriptions -->
- </chain>
-
- <!-- pkt-user. The modules in this chain are called when a packet
- arrives that is address to a specific user. Note that this
- chain is also responsible for delivering packets to user
- sessions as appropriate - this is usually handled by the
- "deliver" module. -->
- <chain id='pkt-user'>
- <module>roster</module> <!-- handle s10n responses -->
- <module>presence</module> <!-- process and distribute incoming presence from external entities -->
- <module>iq-vcard</module> <!-- grab user vcards -->
- <module>amp</module> <!-- advanced message processing -->
- <module>deliver</module> <!-- deliver the packet to an active session if we can -->
- <module>vacation</module> <!-- send vacation messages -->
- <module>offline</module> <!-- save messages and s10ns for later -->
- <module>disco-publish</module> <!-- handle disco publishes; return information about user sessions -->
- <module>iq-last</module> <!-- return time since last logout -->
- </chain>
-
- <!-- pkt-router. The modules in this chain are called when a
- special-purpose packet arrives from the router (eg domain
- advertisements). -->
- <chain id='pkt-router'>
- <module>session</module> <!-- take sessions offline if their c2s disappears -->
- <module>disco</module> <!-- query new components for service information -->
- </chain>
-
- <!-- user-load. The modules in this chain are called to load
- per-user data. This will happen before a user can be used (ie
- before a session is created). -->
- <chain id='user-load'>
- <module>active</module> <!-- get active status -->
- <module>roster</module> <!-- load the roster and trust list -->
- <module>roster-publish</module> <!-- load the published roster -->
- <module>privacy</module> <!-- load privacy lists -->
- <module>disco-publish</module> <!-- load published information -->
- <module>vacation</module> <!-- load vacation settings -->
- </chain>
-
- <!-- user-create. The modules in this chain are called when a user
- creation request is received (usually from c2s as part of a
- registration request). This initialises any per-user data. -->
- <chain id='user-create'>
- <module>active</module> <!-- activate new users -->
- <module>template-roster</module> <!-- populate roster from template -->
- </chain>
-
- <!-- user-delete. The modules in this chain are called when a user
- deletion request is received (usually from c2s as part of a
- registration removal request). This deletes all data that may
- have been previously created for the user during normal
- operation. -->
- <chain id='user-delete'>
- <module>active</module> <!-- deactivate users -->
- <module>announce</module> <!-- delete motd data -->
- <module>disco-publish</module> <!-- delete published information -->
- <module>offline</module> <!-- bounce queued messages -->
- <module>privacy</module> <!-- delete privacy lists -->
- <module>roster</module> <!-- delete roster -->
- <module>vacation</module> <!-- delete vacation settings -->
- <module>status</module> <!-- delete status information -->
- <module>iq-last</module> <!-- delete last logout time -->
- <module>iq-private</module> <!-- delete private data -->
- <module>iq-vcard</module> <!-- delete vcard -->
- </chain>
-
- <!-- disco-extend. The modules in this chain are called when a disco
- info request is send to session manager. It implements XEP-0128
- Service Discovery Extensions mechanizm to add additional
- information to disco#info reply. -->
- <chain id='disco-extend'>
- <module>iq-version</module> <!-- add XEP-xxxx Software Information -->
- <module>help</module> <!-- add XEP-0157 Contact Addresses -->
- </chain>
-
- </modules>
-
- <!-- Service discovery configuration -->
- <discovery>
-
- <!-- Service identity. these specify the category, type and name of
- this service that will be included in discovery information
- responses. -->
- <identity>
- <category>server</category> <!-- default: server -->
- <type>im</type> <!-- default: im -->
- <name>Jabber IM server</name> <!-- default: Jabber IM server -->
- </identity>
-
- <!-- The discovery module can respond to jabber:iq:agents queries
- for compatibility with older clients. Comment this out to
- disable this. -->
- <agents/>
-
- <!-- Static service list.
-
- The discover module can discover disco-capable services
- automatically as they come online. Most XEP-0114 components,
- however, will not support discovery. In order to get them to
- appear in disco/agents lists returned to the client, they
- should be listed here.
-
- Note that if a disco-capable service with the same name as one
- listed below comes online, the information it provides will
- override the information listed below.
-
- The "category" and "type" attributes, and the list of supported
- namespaces are only used for agents compatibility. If you have
- disabled this above, you may omit them. -->
- <items>
-
- <!-- example entry for a user directory -->
- <!--
- <item category='service' type='jud' jid='users.jabber.org' name='Jabber User Directory'/>
- -->
-
- <!-- example entry for a groupchat (conference) service -->
- <!--
- <item category='conference' type='public' jid='conference.jabber.org' name='Text conferencing'/>
- -->
-
- </items>
-
- <!-- Server information added to server discovery information
- in http://jabber.org/network/serverinfo jabber:x:data form. (XEP-0157)
-
- May contain many values per item -->
- <!--
- <serverinfo>
- <admin-addresses>
- <value>mailto:xmpp@localhost.localdomain</value>
- <value>xmpp:admins@localhost.localdomain</value>
- </admin-addresses>
- <abuse-addresses>
- <value>mailto:abuse@localhost.localdomain</value>
- <value>xmpp:abuse@localhost.localdomain</value>
- </abuse-addresses>
- <feedback-addresses>
- <value>http://example.org/feedback.php</value>
- </feedback-addresses>
- <sales-addresses/>
- <security-addresses/>
- <support-addresses/>
- </serverinfo>
- -->
-
- </discovery>
-
- <!-- User options -->
- <user>
- <!-- By default, users must explicitly created before they can start
- a session. The creation process is usually triggered by a c2s
- component in response to a client registering a new user.
-
- Enableing this option will make it so that a user create will be
- triggered the first time a non-existant user attempts to start
- a session. This is useful if you already have users in an
- external authentication database (eg LDAP) and you don't want
- them to have to register. -->
- <auto-create/>
-
- <!-- Templates. If defined, the contents of these files will be
- stored in the users data store when they are created. -->
- <template>
- <!-- Uncomment <publish> if you wish to forcely publish
- roster template from ldap on each user login -->
- <!--
- <publish>
- -->
- <!-- If <check-remove-domain> given, then published contact checked
- against sm user database and if user is unknown to sm, contact
- will be deleted from user's roster (if it is in roster). -->
- <!--
- <check-remove-domain>jabber.example.com</check-remove-domain>
- -->
- <!-- Keep cache of "active" database specified number of seconds.
- This will significantly speed up publishing of roster.
- If unspecified or 0, no cache is used. -->
- <active-cache-ttl>60</active-cache-ttl>
- <!-- If <fix-subscriptions/> is not commented, set subscriptions of
- user's contacts to subscriptions of corresponding published
- contacts. As for now, "both". -->
- <!--
- <fix-subscriptions/>
- -->
- <!-- If <override-names/> is not commented, then displayed names of
- contacts in user's roster will be updated accordingly to
- published roster (if they differ). If commented, then user can
- rename contacs in roster -->
- <!--
- <override-names/>
- -->
- <!-- when mapped-groups is on (<map-groups/> is uncommented, the actual
- group names for published contacts are read from
- published-roster-groups storage type, which in turn may be mapped
- to ldapvcard driver. The key for searching is published user's
- group, and returned value is used as group name. So you can assign
- textual group IDs to users rather then group names.
- group-cache-ttl keeps cache of mapping group id <-> group name for
- specified number of seconds. If unspecified or 0, no cache is used.
- -->
- <!--
- <mapped-groups/>
- <map-groups/>
- <group-cache-ttl>120</group-cache-ttl>
- </mapped-groups>
- -->
- <!-- If <force-groups> is commented out, published roster's contact
- added to user's roster only when user does not have this contact.
- If <force-groups> is not commented out, then these checks performed
- against roster item when publishing roster item that already in
- user's roster:
- If user already has added his roster's contact to group of
- published contact, no changes are made with this group (note
- that contact may be in more than one group).
- If <prefix> given, then prefix of each group of user's compared
- whith given prefix, and if it matches, user's contact removed from
- matched group (see below).
- Same for <suffix>.
- After that, user's contact added to a group of published roster's
- contact.
- In other words, all groups of updated contact, that match prefix
- or suffix, replaced with group of published contact.
- This is done because there is no way to determine that group was
- published or greated by user. -->
- <!--
- <force-groups>
- <prefix>MyOrg.</prefix>
- <suffix>(MyOrg)</suffix>
- </force-groups>
- -->
- <!--
- </publish>
- -->
-
- <!-- If you defined publish, you should comment <roster> -->
- <!--
- <roster>/etc/jabberd/templates/roster.xml</roster>
- -->
- </template>
- </user>
-
- <!-- Advanced Message Processing module configuration -->
- <amp>
- <!-- You can disable some actions -->
- <!--
- <disableactions>
- <drop/>
- <error/>
- <alert/>
- <notify/>
- </disableactions>
- -->
-
- <!-- You can disable some conditions -->
- <!--
- <disableconditions>
- <expireat/>
- <matchresource/>
- <deliver/>
- </disableconditions>
- -->
-
- <!-- You need to enable this if your server has offline storage disabled -->
- <!--
- <offlinestoragedisabled/>
- -->
- </amp>
-
- <!-- Offline module configuration -->
- <offline>
- <!-- Do not store messages in offline store -->
- <!--
- <dropmessages/>
- -->
-
- <!-- Store headline messages in offline store -->
- <!--
- <storeheadlines/>
- -->
-
- <!-- Do not store subscription requests in offline store -->
- <!--
- <dropsubscriptions/>
- -->
-
- <!-- Offline storage message quota.
- Specifies how many messages will be stored in user offline store -->
- <!--
- <userquota>500</userquota>
- -->
- </offline>
-
- <!-- roster module configuration -->
- <roster>
- <!-- maximum items per user roster -->
- <!--
- <maxitems>100</maxitems>
- -->
- </roster>
-
- <!-- status module configuration -->
- <status>
- <!-- presence service resource
- disabled when commented out -->
- <!--
- <resource>webstatus</resource>
- -->
- </status>
-
-</sm>
-<!--
- vim: syntax=xml
--->
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index 17e19fa..109c5c3 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -43,7 +43,6 @@ mv var $RPM_BUILD_ROOT/
tar -C $RPM_BUILD_ROOT%{prepdir} -cf - etc \
--exclude=etc/tomcat5 \
- --exclude=etc/jabberd \
| tar -C $RPM_BUILD_ROOT -xvf -
echo "" > $RPM_BUILD_ROOT/%{_sysconfdir}/rhn/rhn.conf
commit a7fa9e27436d7308b6254325fc264b36897269d9
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Aug 28 17:49:41 2009 +0200
add spacewalk-setup-jabberd script
New script for modifying jabberd configuration using XSL
transformations.
diff --git a/spacewalk/setup/Makefile.PL b/spacewalk/setup/Makefile.PL
index 1197771..a66e087 100644
--- a/spacewalk/setup/Makefile.PL
+++ b/spacewalk/setup/Makefile.PL
@@ -8,7 +8,7 @@ WriteMakefile(
VERSION_FROM => 'lib/Spacewalk/Setup.pm',
ABSTRACT_FROM => 'lib/Spacewalk/Setup.pm',
PL_FILES => {},
- EXE_FILES => ['bin/spacewalk-setup', 'bin/cobbler-setup', 'bin/spacewalk-make-mount-points'],
+ EXE_FILES => ['bin/spacewalk-setup', 'bin/spacewalk-setup-jabberd', 'bin/cobbler-setup', 'bin/spacewalk-make-mount-points'],
PREREQ_PM => {
'Test::More' => 0,
},
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index f920e6f..d034585 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -126,6 +126,9 @@ setup_monitoring(\%opts, \%answers);
print Spacewalk::Setup::loc("* Configuring apache SSL virtual host.\n");
setup_ssl_vhost(\%opts, \%answers);
+print Spacewalk::Setup::loc("* Configuring jabberd.\n");
+setup_jabberd(\%opts, \%answers);
+
print Spacewalk::Setup::loc("* Creating SSL certificates.\n");
setup_ssl_certs(\%opts, \%answers);
@@ -515,6 +518,16 @@ sub setup_ssl_vhost {
return;
}
+sub setup_jabberd {
+ my $opts = shift;
+ my $answers = shift;
+
+ system('rpm -q jabberd >& /dev/null');
+ if ($? >> 8 == 0) {
+ system("/usr/bin/spacewalk-setup-jabberd", "--macros", "hostname:$answers->{'hostname'}");
+ }
+}
+
sub setup_ssl_certs {
my $opts = shift;
my $answers = shift;
@@ -965,15 +978,6 @@ sub populate_initial_configs {
$hibernate_url = "jdbc:postgresql://" . $answers->{"db-host"} . ":" . $answers->{"db-port"} . "/" . $answers->{"db-sid"};
}
- # Check where jabberd's lib dir is, can vary on x86_64:
- my $jabberdLibDir = "/usr/lib/jabberd/";
- if (-d "/usr/lib64/jabberd/") {
- $jabberdLibDir = "/usr/lib64/jabberd";
- }
-
- # Generate a random password for jabberd:
- my $jabberdRouterPassword = `dd if=/dev/urandom bs=20 count=1 2>/dev/null | sha1sum | awk '{print \$1}'`;
-
my %config_opts =
(
mount_point => $answers->{'mount-point'} || '/var/satellite',
@@ -998,8 +1002,6 @@ sub populate_initial_configs {
hibernate_url => $hibernate_url,
traceback_mail => $answers->{'admin-email'},
jabberDOThostname => $answers->{hostname},
- jabberDOTlibdir => $jabberdLibDir,
- jabberDOTdbpass => $jabberdRouterPassword,
osadispatcherDOTusername => 'rhn-dispatcher-sat',
osadispatcherDOTpassword => 'rhn-dispatcher-' . random_password(6),
serverDOTsatelliteDOTca_chain => '/usr/share/rhn/RHNS-CA-CERT',
diff --git a/spacewalk/setup/bin/spacewalk-setup-jabberd b/spacewalk/setup/bin/spacewalk-setup-jabberd
new file mode 100755
index 0000000..55d2e04
--- /dev/null
+++ b/spacewalk/setup/bin/spacewalk-setup-jabberd
@@ -0,0 +1,88 @@
+#!/usr/bin/perl
+#
+# Copyright (c) 2009 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# Red Hat trademarks are not licensed under GPLv2. No permission is
+# granted to use or replicate Red Hat trademarks that are incorporated
+# in this software or its documentation.
+#
+
+use Spacewalk::Setup;
+use Sys::Hostname;
+use Getopt::Long;
+
+use strict 'refs';
+use warnings;
+
+my $verbose = 0;
+my $macros = '';
+my $help = 0;
+my %macros = ('hostname' => Sys::Hostname::hostname());
+
+GetOptions("macros:s" => \$macros, "verbose" => \$verbose, "help" => \$help);
+
+if ($help) {
+ print <<EOHELP;
+Usage: $0 --help | --verbose | --macros macros
+Options:
+ --help Print this help message
+ --verbose Verbose operation
+ --macros Comma delimited list of macroname:macrovalue options
+EOHELP
+
+ exit 0;
+}
+
+if ($macros) {
+ foreach my $i (split(/,/, $macros, 0)) {
+ my ($key, $value) = split(/:/, $i, 3);
+ $macros{$key} = $value;
+ }
+}
+
+foreach my $basename ('c2s', 's2s', 'sm') {
+ my $configfile = "/etc/jabberd/$basename.xml";
+ my $template = Spacewalk::Setup::SHARED_DIR . "/jabberd/$basename.xsl";
+
+ {
+ $/ = undef;
+
+ print Spacewalk::Setup::loc("Processing $configfile...\n") if $verbose;
+ my $transformed = `/usr/bin/xsltproc $template $configfile`;
+ die "There was an error running xsltproc\n" if $?;
+
+ local *F;
+ open F, $configfile;
+ my $original = <F>;
+ close F;
+
+ if ($transformed ne $original) {
+ print Spacewalk::Setup::loc("$configfile has been backed up to $configfile-swsave\n") if $verbose;
+ system('cp', '-p', '--backup=numbered', $configfile, "$configfile-swsave");
+
+ for my $key (keys %macros) {
+ $transformed =~ s/\@$key\@/$macros{$key}/mg;
+ }
+
+ my @statistics = stat($configfile);
+
+ open F, ">$configfile";
+ print F $transformed;
+ close F;
+
+ chown $statistics[4], $statistics[5], $configfile;
+ chmod 0640, $configfile;
+ }
+ elsif ($verbose) {
+ print Spacewalk::Setup::loc(" No changes were made\n");
+ }
+ }
+
+}
diff --git a/spacewalk/setup/share/jabberd/c2s.xsl b/spacewalk/setup/share/jabberd/c2s.xsl
new file mode 100644
index 0000000..9c5a0e7
--- /dev/null
+++ b/spacewalk/setup/share/jabberd/c2s.xsl
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes" omit-xml-declaration="yes" />
+
+<xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+</xsl:template>
+
+<xsl:template match="/c2s/local/id">
+ <xsl:copy>
+ <xsl:attribute name="require-starttls">false</xsl:attribute>
+ <xsl:attribute name="pemfile">/etc/pki/spacewalk/jabberd/server.pem</xsl:attribute>
+ <xsl:attribute name="realm"></xsl:attribute>
+ <xsl:attribute name="register-enable">true</xsl:attribute>
+ <xsl:text>@hostname@</xsl:text>
+ </xsl:copy>
+</xsl:template>
+
+<xsl:template match="/c2s/authreg/module">
+ <xsl:copy>
+ <xsl:text>db</xsl:text>
+ </xsl:copy>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/spacewalk/setup/share/jabberd/s2s.xsl b/spacewalk/setup/share/jabberd/s2s.xsl
new file mode 100644
index 0000000..95459c5
--- /dev/null
+++ b/spacewalk/setup/share/jabberd/s2s.xsl
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes" omit-xml-declaration="yes" />
+
+<xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+</xsl:template>
+
+<xsl:template match="/s2s/local">
+ <xsl:copy>
+ <xsl:if test="not(resolver)">
+ <xsl:text>
+ </xsl:text>
+ <xsl:comment>
+ Helper DNS resolver component - if this component is not
+ connected, dialback connections will fail
+ (default: resolver) </xsl:comment>
+ <xsl:text>
+ </xsl:text>
+ <resolver>resolver</resolver>
+ <xsl:text>
+ </xsl:text>
+ </xsl:if>
+ <xsl:apply-templates select="@*|node()" />
+ </xsl:copy>
+</xsl:template>
+
+<xsl:template match="/s2s/check/interval">
+ <xsl:copy>3</xsl:copy>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/spacewalk/setup/share/jabberd/sm.xsl b/spacewalk/setup/share/jabberd/sm.xsl
new file mode 100644
index 0000000..83ce864
--- /dev/null
+++ b/spacewalk/setup/share/jabberd/sm.xsl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes" omit-xml-declaration="yes" />
+
+<xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+</xsl:template>
+
+<xsl:template match="/sm/id">
+ <xsl:copy>
+ <xsl:text>@hostname@</xsl:text>
+ </xsl:copy>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 2759b4c..1e9ae3c 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -67,8 +67,10 @@ install -m 0644 share/ssl.conf.6 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/old-jvm-list %{buildroot}/%{_datadir}/spacewalk/setup/
install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d/
install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/upgrade
+install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/jabberd
install -m 0755 share/upgrade/* %{buildroot}/%{_datadir}/spacewalk/setup/upgrade
install -m 0644 share/defaults.d/defaults.conf %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d/
+install -m 0644 share/jabberd/* %{buildroot}/%{_datadir}/spacewalk/setup/jabberd/
# jabberd ssl cert location
install -d -m 755 %{buildroot}/%{_sysconfdir}/pki/spacewalk/jabberd
@@ -94,6 +96,7 @@ rm -rf %{buildroot}
%doc Changes README
%{perl_vendorlib}/*
%{_bindir}/spacewalk-setup
+%{_bindir}/spacewalk-setup-jabberd
%{_bindir}/spacewalk-make-mount-points
%{_bindir}/cobbler-setup
%{_mandir}/man[13]/*.[13]*
14 years, 7 months
Changes to 'refs/tags/spacewalk-web-0.7.2-1'
by Michael Mraka
Tag 'spacewalk-web-0.7.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-08-28 13:55 +0000
Tagging package [spacewalk-web] version [0.7.2-1] in directory [web/].
Changes since spacewalk-ssl-cert-check-1.8-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-web] release [0.7.2-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
14 years, 7 months
rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 2fc692eeedd20506ea374b72a2029a42e8c15ffb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 28 15:55:11 2009 +0200
Automatic commit of package [spacewalk-web] release [0.7.2-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index a078a0d..6a48378 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-0.7.1-1 web/
+0.7.2-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 36b0b0f..9976f09 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.1
+Version: 0.7.2
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -317,6 +317,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Aug 28 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.2-1
+- awk | sed | sed is rarely needed
+- use spacewalk-cfg-get instead of awk
+
* Thu Aug 20 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.1-1
- fix an ISE relating to config management w/selinux (Joshua Roys)
- allow users to chat with spacewalk members on IRC via the web. (jesusr(a)redhat.com)
14 years, 7 months
Changes to 'refs/tags/spacewalk-ssl-cert-check-1.8-1'
by Michael Mraka
Tag 'spacewalk-ssl-cert-check-1.8-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-08-28 13:53 +0000
Tagging package [spacewalk-ssl-cert-check] version [1.8-1] in directory [projects/ssl-cert-check/].
Changes since oracle-server-scripts-10.2.0-31:
Michael Mraka (1):
Automatic commit of package [spacewalk-ssl-cert-check] release [1.8-1].
---
projects/ssl-cert-check/spacewalk-ssl-cert-check.spec | 6 +++++-
rel-eng/packages/spacewalk-ssl-cert-check | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
14 years, 7 months
projects/ssl-cert-check rel-eng/packages
by Michael Mraka
projects/ssl-cert-check/spacewalk-ssl-cert-check.spec | 6 +++++-
rel-eng/packages/spacewalk-ssl-cert-check | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit eebe67ba868b4372b6bda7abbeec67e8635ec310
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 28 15:53:35 2009 +0200
Automatic commit of package [spacewalk-ssl-cert-check] release [1.8-1].
diff --git a/projects/ssl-cert-check/spacewalk-ssl-cert-check.spec b/projects/ssl-cert-check/spacewalk-ssl-cert-check.spec
index c5626ed..aec519b 100644
--- a/projects/ssl-cert-check/spacewalk-ssl-cert-check.spec
+++ b/projects/ssl-cert-check/spacewalk-ssl-cert-check.spec
@@ -4,7 +4,7 @@ Group: Applications/System
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.7
+Version: 1.8
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -43,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id: ssl-cert-check.spec,v 1.1 2005/05/09 17:58:28 alikins Exp $
%changelog
+* Fri Aug 28 2009 Michael Mraka <michael.mraka(a)redhat.com> 1.8-1
+- grep | awk is rarely needed
+- use spacewalk-cfg-get instead of awk
+
* Wed Mar 18 2009 Miroslav Suchy <msuchy(a)redhat.com> 1.7-1
- 490695 - versioned provides
diff --git a/rel-eng/packages/spacewalk-ssl-cert-check b/rel-eng/packages/spacewalk-ssl-cert-check
index 98ef5f7..cbbeb53 100644
--- a/rel-eng/packages/spacewalk-ssl-cert-check
+++ b/rel-eng/packages/spacewalk-ssl-cert-check
@@ -1 +1 @@
-1.7-1 projects/ssl-cert-check/
+1.8-1 projects/ssl-cert-check/
14 years, 7 months
Changes to 'refs/tags/oracle-server-scripts-10.2.0-31'
by Michael Mraka
Tag 'oracle-server-scripts-10.2.0-31' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-08-28 13:52 +0000
Tagging package [oracle-server-scripts] version [10.2.0-31] in directory [projects/oracle-server-scripts/].
Changes since spacewalk-koan-0.2.2-1:
Michael Mraka (1):
Automatic commit of package [oracle-server-scripts] minor release [10.2.0-31].
---
projects/oracle-server-scripts/oracle-server-scripts.spec | 5 ++++-
rel-eng/packages/oracle-server-scripts | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
14 years, 7 months
projects/oracle-server-scripts rel-eng/packages
by Michael Mraka
projects/oracle-server-scripts/oracle-server-scripts.spec | 5 ++++-
rel-eng/packages/oracle-server-scripts | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 805399e7a2c2eeaaefd5d9462fb4a56dcb05429e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 28 15:52:48 2009 +0200
Automatic commit of package [oracle-server-scripts] minor release [10.2.0-31].
diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/projects/oracle-server-scripts/oracle-server-scripts.spec
index 0daf81f..46097c4 100644
--- a/projects/oracle-server-scripts/oracle-server-scripts.spec
+++ b/projects/oracle-server-scripts/oracle-server-scripts.spec
@@ -9,7 +9,7 @@
Summary: Oracle 10g Database Server Enterprise Edition scripts
Name: oracle-server-scripts
Version: 10.2.0
-Release: 30%{?dist}
+Release: 31%{?dist}
Source0: oracle-home.sh
Source1: init-params.ora
Source2: create-db.sh
@@ -99,6 +99,9 @@ exit 0
%{oracle_scripts}
%changelog
+* Fri Aug 28 2009 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0-31
+- grep | awk is rarely needed
+
* Thu Jun 25 2009 John Matthews <jmatthew(a)redhat.com> 10.2.0-30
- handle existing embedded entries in /etc/oratab during install
(mzazrivec(a)redhat.com)
diff --git a/rel-eng/packages/oracle-server-scripts b/rel-eng/packages/oracle-server-scripts
index b06d5f9..3ac337a 100644
--- a/rel-eng/packages/oracle-server-scripts
+++ b/rel-eng/packages/oracle-server-scripts
@@ -1 +1 @@
-10.2.0-30 projects/oracle-server-scripts/
+10.2.0-31 projects/oracle-server-scripts/
14 years, 7 months