spec: Use application name in install path

refs #6401
Icinga · Sep 12, 2014 · e50221f · e50221f
1 parent 7f0a2d5
commit e50221f
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 28 deletions.
diff --git a/icingaweb2.spec b/icingaweb2.spec
@@ -26,12 +26,12 @@
 
 %define revision 1
 
-%define configdir %{_sysconfdir}/icingaweb
-%define sharedir %{_datadir}/icingaweb
-%define prefixdir %{_datadir}/icingaweb
-%define logdir %{sharedir}/log
+%define configdir %{_sysconfdir}/%{name}
+%define sharedir %{_datadir}/%{name}
+%define prefixdir %{_datadir}/%{name}
 %define usermodparam -a -G
-%define logdir %{_localstatedir}/log/icingaweb
+%define logdir %{_localstatedir}/log/%{name}
+%define docdir %{sharedir}/log
 
 %if "%{_vendor}" == "suse"
 %define phpname php5
@@ -172,25 +172,26 @@ install -D -m0644 packages/rpm/etc/httpd/conf.d/icingaweb.conf %{buildroot}/%{ap
 # install public, library, modules
 %{__mkdir} -p %{buildroot}/%{sharedir}
 %{__mkdir} -p %{buildroot}/%{logdir}
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/icingaweb
+%{__mkdir} -p %{buildroot}/%{docdir}
+%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/dashboard
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/icingaweb/modules
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/icingaweb/modules/monitoring
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/icingaweb/enabledModules
+%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}/modules
+%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}/modules/monitoring
+%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}/enabledModules
 
-%{__cp} -r application library modules public %{buildroot}/%{sharedir}/
+%{__cp} -r application doc library modules public %{buildroot}/%{sharedir}/
 
 ## config
 # authentication is db only
-install -D -m0644 packages/rpm/etc/icingaweb/authentication.ini %{buildroot}/%{_sysconfdir}/icingaweb/authentication.ini
+install -D -m0644 packages/rpm/etc/%{name}/authentication.ini %{buildroot}/%{_sysconfdir}/%{name}/authentication.ini
 # custom resource paths
-install -D -m0644 packages/rpm/etc/icingaweb/resources.ini %{buildroot}/%{_sysconfdir}/icingaweb/resources.ini
+install -D -m0644 packages/rpm/etc/%{name}/resources.ini %{buildroot}/%{_sysconfdir}/%{name}/resources.ini
 # monitoring module (icinga2)
-install -D -m0644 packages/rpm/etc/icingaweb/modules/monitoring/backends.ini %{buildroot}/%{_sysconfdir}/icingaweb/modules/monitoring/backends.ini
-install -D -m0644 packages/rpm/etc/icingaweb/modules/monitoring/instances.ini %{buildroot}/%{_sysconfdir}/icingaweb/modules/monitoring/instances.ini
+install -D -m0644 packages/rpm/etc/%{name}/modules/monitoring/backends.ini %{buildroot}/%{_sysconfdir}/%{name}/modules/monitoring/backends.ini
+install -D -m0644 packages/rpm/etc/%{name}/modules/monitoring/instances.ini %{buildroot}/%{_sysconfdir}/%{name}/modules/monitoring/instances.ini
 
 # enable the monitoring module by default
-ln -s %{sharedir}/modules/monitoring %{buildroot}/%{_sysconfdir}/icingaweb/enabledModules/monitoring
+ln -s %{sharedir}/modules/monitoring %{buildroot}/%{_sysconfdir}/%{name}/enabledModules/monitoring
 ## config
 
 # install icingacli
@@ -228,6 +229,8 @@ fi
 %config(noreplace) %attr(-,%{apacheuser},%{apachegroup}) %{configdir}
 # logs
 %attr(2775,%{apacheuser},%{apachegroup}) %dir %{logdir}
+# shipped docs
+%attr(755,%{apacheuser},%{apachegroup}) %{sharedir}/doc
 
 %files -n php-Icinga
 %attr(755,%{apacheuser},%{apachegroup}) %{sharedir}/application

diff --git a/packages/rpm/README.md b/packages/rpm/README.md
@@ -42,8 +42,8 @@ Decide whether to use MySQL or PostgreSQL.
         FLUSH PRIVILEGES;
         quit
 
-    mysql -u root -p icingaweb < /usr/share/doc/icingaweb2-*/schema/accounts.mysql.sql
-    mysql -u root -p icingaweb < /usr/share/doc/icingaweb2-*/schema/preferences.mysql.sql
+    mysql -u root -p icingaweb < /usr/share/doc/icingaweb2*/schema/accounts.mysql.sql
+    mysql -u root -p icingaweb < /usr/share/doc/icingaweb2*/schema/preferences.mysql.sql
 
 ### PostgreSQL
 
@@ -62,8 +62,8 @@ in `/var/lib/pgsql/data/pg_hba.conf` and restart the PostgreSQL server.
 
 Now install the `icingaweb` schema
 
-    bash$  psql -U icingaweb -a -f /usr/share/doc/icingaweb2-*/schema/accounts.pgsql.sql
-    bash$  psql -U icingaweb -a -f /usr/share/doc/icingaweb2-*/schema/preferences.pgsql.sql
+    bash$  psql -U icingaweb -a -f /usr/share/doc/icingaweb2*/schema/accounts.pgsql.sql
+    bash$  psql -U icingaweb -a -f /usr/share/doc/icingaweb2*/schema/preferences.pgsql.sql
 
 
 ## Configuration
@@ -74,16 +74,16 @@ The monitoring module is enabled by default.
 
 ### Backend configuration
 
-`/etc/icingaweb/resources.ini` contains the database backend information.
+`/etc/icingaweb2/resources.ini` contains the database backend information.
 By default the Icinga 2 DB IDO is used by the monitoring module in
-`/etc/icingaweb/modules/monitoring/backends.ini`
+`/etc/icingaweb2/modules/monitoring/backends.ini`
 
 The external command pipe is required for sending commands
 and configured for Icinga 2 in
-`/etc/icingaweb/modules/monitoring/instances.ini`
+`/etc/icingaweb2/modules/monitoring/instances.ini`
 
 ### Authentication configuration
 
-The `/etc/icingaweb/authentication.ini` file uses the internal database as
+The `/etc/icingaweb2/authentication.ini` file uses the internal database as
 default. This requires the database being installed properly before
 allowing users to login via web console.
diff --git a/packages/rpm/etc/httpd/conf.d/icingaweb.conf b/packages/rpm/etc/httpd/conf.d/icingaweb.conf
@@ -1,6 +1,6 @@
-Alias /icingaweb "/usr/share/icingaweb/public"
+Alias /icingaweb "/usr/share/icingaweb2/public"
 
-<Directory "/usr/share/icingaweb/public">
+<Directory "/usr/share/icingaweb2/public">
     Options SymLinksIfOwnerMatch
     AllowOverride None
 
@@ -17,7 +17,7 @@ Alias /icingaweb "/usr/share/icingaweb/public"
         Allow from all
     </IfModule>
 
-    SetEnv ICINGAWEB_CONFIGDIR /etc/icingaweb
+    SetEnv ICINGAWEB_CONFIGDIR /etc/icingaweb2
 
     EnableSendfile Off
 

diff --git a/...ages/rpm/etc/icingaweb/authentication.ini → ...ges/rpm/etc/icingaweb2/authentication.ini b/...ages/rpm/etc/icingaweb/authentication.ini → ...ges/rpm/etc/icingaweb2/authentication.ini
diff --git a/...icingaweb/modules/monitoring/backends.ini → ...cingaweb2/modules/monitoring/backends.ini b/...icingaweb/modules/monitoring/backends.ini → ...cingaweb2/modules/monitoring/backends.ini
diff --git a/...cingaweb/modules/monitoring/instances.ini → ...ingaweb2/modules/monitoring/instances.ini b/...cingaweb/modules/monitoring/instances.ini → ...ingaweb2/modules/monitoring/instances.ini
diff --git a/packages/rpm/etc/icingaweb/resources.ini → packages/rpm/etc/icingaweb2/resources.ini b/packages/rpm/etc/icingaweb/resources.ini → packages/rpm/etc/icingaweb2/resources.ini
@@ -22,7 +22,7 @@ socket              = /var/run/icinga2/cmd/livestatus
 
 [logfile]
 type                = file
-filename            = "/var/log/icingaweb/icingaweb.log"
+filename            = "/var/log/icingaweb2/icingaweb2.log"
 fields              = "/^(?<datetime>[0-9]{4}(-[0-9]{2}){2}T[0-9]{2}(:[0-9]{2}){2}(\\+[0-9]{2}:[0-9]{2})?) - (?<loglevel>[A-Za-z]+) - (?<message>.*)$/"
 ; format: PCRE
 ;
diff --git a/packages/rpm/usr/bin/icingacli b/packages/rpm/usr/bin/icingacli
@@ -2,5 +2,5 @@
 <?php
 
 use Icinga\Application\Cli;
-require_once '/usr/share/icingaweb/library/Icinga/Application/Cli.php';
+require_once '/usr/share/icingaweb2/library/Icinga/Application/Cli.php';
 Cli::start()->dispatch();