Move to /usr, add README for Fedora.

diff --git a/README.Fedora b/README.Fedora
new file mode 100644 (file)
index 0000000..9e5429e
--- /dev/null
+++ b/README.Fedora
@@ -0,0 +1,12 @@
+Machine certificate is required at /etc/grid-security.
+
+By default only dummy backend is activated.
+
+Start both daemons:
+
+  service memcached start
+  service httpd start
+
+For more information visit:
+
+  https://github.com/EGI-FCTF/rOCCI-server/wiki/rOCCI-Server-Admin-Guide

diff --git a/rOCCI-server.spec b/rOCCI-server.spec
index 3e6522c..a94d7d5 100644 (file)
--- a/rOCCI-server.spec
+++ b/rOCCI-server.spec
@@ -1,6 +1,5 @@
 %global gem_name occi-server
-# %%{_datadir}/%%{name}
-%global app_root /opt/%{name}
+%global app_root %{_datadir}/%{name}
 %global semodule_name rocci_server
 %global use_bundler 1
 
@@ -19,6 +18,7 @@ Source0:        https://github.com/EGI-FCTF/%{name}/archive/%{commit}/%{name}-%{
 Source1:        %{semodule_name}.te
 Source2:        %{semodule_name}.fc
 Source3:        %{name}.logrotate
+Source4:        README.Fedora
 Patch0:         rocci-server-gemfile.diff
 Patch1:         rocci-server-unbundle.diff
 
@@ -106,7 +106,7 @@ echo 'gem "openssl_cms_2_1", require: false, platforms: :ruby_21' > lib/authenti
 # tweak Gemfile
 %patch0 -p1
 # kill bundler
-%if %{use_bundler}
+%if ! %{use_bundler}
 %patch1 -p1
 %endif
 
@@ -124,11 +124,11 @@ mkdir -p %{buildroot}%{app_root}
 mkdir -p %{buildroot}%{_sysconfdir}
 cp -a . %{buildroot}%{app_root}
 
-# unused
+# unused files
 rm -f %{buildroot}%{app_root}/.gitignore
 find %{buildroot}%{app_root} -name .keep -delete
 
-# config files
+# configuration files
 mv %{buildroot}%{app_root}/etc %{buildroot}%{_sysconfdir}/rocci-server
 ln -s %{_sysconfdir}/rocci-server %{buildroot}%{app_root}/etc
 
@@ -141,7 +141,6 @@ install -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
 # bundler:
 # - no Gemfile.lock
-# - enable shared gems
 # - disable backends dependencies for now
 mv %{buildroot}%{app_root}/Gemfile.lock %{buildroot}%{app_root}/Gemfile.lock.upstream
 touch %{buildroot}%{app_root}/Gemfile.lock
@@ -153,16 +152,20 @@ mv %{buildroot}%{app_root}/lib/backends/bundles/Gemfile.opennebula %{buildroot}%
 rdoc --op %{buildroot}%{_pkgdocdir} lib app *.md
 chmod -x %{buildroot}%{_pkgdocdir}/images/*.png
 
+install -p -m 0644 %{SOURCE4} %{buildroot}%{_pkgdocdir}
+
 # SELinux
 mkdir -p %{buildroot}%{_datadir}/selinux/packages/%{name}
 install -m 0644 %{semodule_name}.pp %{buildroot}%{_datadir}/selinux/packages/%{name}
 rm -f %{buildroot}%{app_root}/%{semodule_name}.mod
 rm -f %{buildroot}%{app_root}/%{semodule_name}.pp
 
-# httpd configuration
+# httpd configuration tweaks
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
-# update for apache >= 2.4
-sed -i examples/etc/apache2/sites-available/occi-ssl -e 's/Allow from all/Require all granted/i'
+# apache >= 2.4, applicaton prefix
+sed -i examples/etc/apache2/sites-available/occi-ssl \
+  -e 's/Allow from all/Require all granted/i' \
+  -e 's,/opt/rOCCI-server,%{app_root},g'
 install -p -m 0644 examples/etc/apache2/sites-available/occi-ssl %{buildroot}%{_sysconfdir}/httpd/conf.d/occi-ssl.conf
 echo "Listen 11443" >>  %{buildroot}%{_sysconfdir}/httpd/conf.d/occi-listen.conf
 install -p -m 0644 examples/etc/apache2/conf.d/security %{buildroot}%{_sysconfdir}/httpd/conf.d/occi-security.conf
@@ -233,6 +236,7 @@ fi
 
 
 %files
+%doc %{_pkgdocdir}/README.Fedora
 %doc %{app_root}/LICENSE
 %config(noreplace) %{_sysconfdir}/rocci-server/
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
@@ -240,6 +244,7 @@ fi
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/occi-security.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/occi-ssl.conf
 %dir %{_datadir}/selinux/packages/%{name}/
+%dir %{app_root}/
 %{app_root}/.bundle/
 %{app_root}/app/
 %{app_root}/bin/
@@ -272,6 +277,5 @@ fi
 
 
 %changelog
-* Mon Sep 08 2014 František Dvořák <valtri@civ.zcu.cz> - 1.0.5-1.20140830gite142d83
+* Wed Sep 10 2014 František Dvořák <valtri@civ.zcu.cz> - 1.0.5-1.20140830gite142d83
 - Initial package
-- Still in /opt

diff --git a/rocci_server.fc b/rocci_server.fc
index ea858c9..e480abf 100644 (file)
--- a/rocci_server.fc
+++ b/rocci_server.fc
@@ -1,3 +1,3 @@
 /var/log/rocci-server(/.*)?    system_u:object_r:passenger_log_t:s0
-/opt/rOCCI-server/lib(/.*)?    system_u:object_r:passenger_var_lib_t:s0
-/opt/rOCCI-server/Gemfile.lock system_u:object_r:passenger_tmp_t:s0
+/usr/share/rOCCI-server/lib(/.*)?      system_u:object_r:passenger_var_lib_t:s0
+/usr/share/rOCCI-server/Gemfile.lock   system_u:object_r:passenger_tmp_t:s0