completed setup for installation, fixed robustness problem.

[upnpmonitor] / wamblee-upnpmonitor / pom.xml

diff --git a/wamblee-upnpmonitor/pom.xml b/wamblee-upnpmonitor/pom.xml
index 85fcd569be6798c8848d37098e4d676fff90cecb..1f73a3751541c7a35c6eb18ea365a13531ad6c6e 100644 (file)
--- a/wamblee-upnpmonitor/pom.xml
+++ b/wamblee-upnpmonitor/pom.xml
@@ -60,20 +60,33 @@
                         </mapping>
                                                
                                                <mapping>
+                            <directory>/opt/upnpmonitor/etc</directory>
+                            <username>root</username>
+                            <groupname>root</groupname>                                                        
+                            <sources>
+                                <source>
+                                    <location>files/opt/upnpmonitor/etc</location>
+                                </source>
+                            </sources>
+                        </mapping>
+                                               
+                                               <mapping>
                                                    <directory>/opt/upnpmonitor/lib</directory>
                                                        <filemode>755</filemode>
                                                        <username>root</username>
                                                        <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>
@@ -94,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>