X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=wamblee-upnpmonitor%2Fpom.xml;h=1f73a3751541c7a35c6eb18ea365a13531ad6c6e;hb=refs%2Fheads%2Fmaster;hp=8a651ed83e54e2637bd82476131bb5b7172025cd;hpb=5b06c61e9b79a5b38078ee079a410c9f9c1a816b;p=upnpmonitor

diff --git a/wamblee-upnpmonitor/pom.xml b/wamblee-upnpmonitor/pom.xml
index 8a651ed..1f73a37 100644
--- a/wamblee-upnpmonitor/pom.xml
+++ b/wamblee-upnpmonitor/pom.xml
@@ -48,12 +48,24 @@
                         </mapping>
 						
 						<mapping>
-                            <directory>/opt/upnpmonitor</directory>
+                            <directory>/opt/upnpmonitor/bin</directory>
                             <username>root</username>
                             <groupname>root</groupname>
+							<filemode>755</filemode>
+                            <sources>
+                                <source>
+                                    <location>files/opt/upnpmonitor/bin</location>
+                                </source>
+                            </sources>
+                        </mapping>
+						
+						<mapping>
+                            <directory>/opt/upnpmonitor/etc</directory>
+                            <username>root</username>
+                            <groupname>root</groupname>							
                             <sources>
                                 <source>
-                                    <location>files/opt/upnpmonitor</location>
+                                    <location>files/opt/upnpmonitor/etc</location>
                                 </source>
                             </sources>
                         </mapping>
@@ -65,14 +77,16 @@
 							<groupname>root</groupname>
 							<dependency/>
 						</mapping>
-                       
-                        <mapping>
-                            <directory>/etc/profile.d</directory>
+						
+						<mapping>
+                            <directory>/etc/sysconfig</directory>
                             <username>root</username>
                             <groupname>root</groupname>
+							<directoryIncluded>false</directoryIncluded>
+                            <configuration>noreplace</configuration>
                             <sources>
                                 <source>
-                                    <location>files/etc/profile.d</location>
+                                    <location>files/etc/sysconfig</location>
                                 </source>
                             </sources>
                         </mapping>
@@ -93,28 +107,18 @@
                         <provide>upnpmonitor</provide>
                     </provides>
                     <requires>
-                        <require>java-1_6_0-sun-devel</require>
+                        <require>java</require>
                     </requires>
 					<preinstallScriptlet>
 					   <script><![CDATA[
 					       
-					       if grep '^java:' /etc/passwd > /dev/null
+					       if grep '^upnpmonitor:' /etc/passwd > /dev/null
 					       then
-					         echo "User java already exists." 1>&2
+					         echo "User upnpmonitor already exists." 1>&2
 					       else
-					         /usr/sbin/useradd -m java
+					         /usr/sbin/useradd upnpmonitor
 					       fi
-					       (
-					         echo "Make sure that user java has login enabled!"
-					         echo "(passwd java)"
-					       ) 1>&2
-					       
-					       if [[ -r /etc/init.d/glassfish ]]
-					       then
-					         echo "This RPM does not support upgrade" 1>&2
-					         exit 1
-					       fi
-					   
+
 					   ]]></script>
 					</preinstallScriptlet>