First, finish renaming all of the *portal* files to their corresponding *aggregator* files. Also update the init scripts to use the appropriate PID files so that "service deltacloud-dbomatic status" actually works.
Signed-off-by: Chris Lalancette <[email protected]> --- conf/deltacloud-aggregator-httpd.conf | 23 +++++++++++++++++++++++ conf/deltacloud-aggregator.logrotate | 12 ++++++++++++ conf/deltacloud-condor_refreshd | 3 +-- conf/deltacloud-dbomatic | 3 +-- conf/deltacloud-image_builder_service | 2 +- conf/deltacloud-portal.conf | 23 ----------------------- conf/deltacloud-portal.logrotate | 12 ------------ deltacloud-aggregator.spec.in | 7 ++----- 8 files changed, 40 insertions(+), 45 deletions(-) create mode 100644 conf/deltacloud-aggregator-httpd.conf create mode 100644 conf/deltacloud-aggregator.logrotate delete mode 100644 conf/deltacloud-portal.conf delete mode 100644 conf/deltacloud-portal.logrotate diff --git a/conf/deltacloud-aggregator-httpd.conf b/conf/deltacloud-aggregator-httpd.conf new file mode 100644 index 0000000..6ef80b8 --- /dev/null +++ b/conf/deltacloud-aggregator-httpd.conf @@ -0,0 +1,23 @@ +NameVirtualHost *:80 +<VirtualHost *:80> + + ErrorLog /etc/httpd/logs/error_log + TransferLog /etc/httpd/logs/access_log + LogLevel warn + + ProxyRequests Off + +Alias /deltacloud/stylesheets "/usr/share/deltacloud-aggregator/public/stylesheets" +Alias /deltacloud/images "/usr/share/deltacloud-aggregator/public/images" +Alias /deltacloud/errors "/usr/share/deltacloud-aggregator/public/" + +ProxyPass /deltacloud/images ! +ProxyPass /deltacloud/stylesheets ! +ProxyPass /deltacloud/errors ! +ProxyPass /deltacloud http://localhost:3000/deltacloud +ProxyPassReverse /deltacloud http://localhost:3000/deltacloud +ProxyPassReverse /deltacloud/images ! +ProxyPassReverse /deltacloud/stylesheets ! +ProxyPassReverse /deltacloud/errors ! + +</VirtualHost> diff --git a/conf/deltacloud-aggregator.logrotate b/conf/deltacloud-aggregator.logrotate new file mode 100644 index 0000000..3d10fd9 --- /dev/null +++ b/conf/deltacloud-aggregator.logrotate @@ -0,0 +1,12 @@ +weekly +rotate 52 +compress +missingok +notifempty + +/var/log/deltacloud-aggregator/rails.log /var/log/deltacloud-aggregator/thin.log { + sharedscripts + postrotate + /etc/init.d/deltacloud-aggregator restart + endscript +} diff --git a/conf/deltacloud-condor_refreshd b/conf/deltacloud-condor_refreshd index c991f37..51a348a 100755 --- a/conf/deltacloud-condor_refreshd +++ b/conf/deltacloud-condor_refreshd @@ -19,7 +19,6 @@ DCLOUD_USER="${DCLOUD_USER:-dcloud}" REFRESHD_PATH=/usr/share/deltacloud-aggregator/condor_refreshd REFRESHD_PROG=condor_refreshd -REFRESHD_PID=/var/run/deltacloud-aggregator/condor_refreshd.pid . /etc/init.d/functions @@ -67,7 +66,7 @@ case "$1" in restart ;; status) - status $REFRESHD_PROG + status -p $REFRESHD_PID $REFRESHD_PROG RETVAL=$? ;; *) diff --git a/conf/deltacloud-dbomatic b/conf/deltacloud-dbomatic index 782231b..dd05356 100755 --- a/conf/deltacloud-dbomatic +++ b/conf/deltacloud-dbomatic @@ -19,7 +19,6 @@ DCLOUD_USER="${DCLOUD_USER:-dcloud}" DBOMATIC_PATH=/usr/share/deltacloud-aggregator/dbomatic DBOMATIC_PROG=dbomatic -DBOMATIC_PID=/var/run/deltacloud-aggregator/dbomatic.pid . /etc/init.d/functions @@ -67,7 +66,7 @@ case "$1" in restart ;; status) - status $DBOMATIC_PROG + status -p $DBOMATIC_PID $DBOMATIC_PROG RETVAL=$? ;; *) diff --git a/conf/deltacloud-image_builder_service b/conf/deltacloud-image_builder_service index ee2f4ac..9045686 100755 --- a/conf/deltacloud-image_builder_service +++ b/conf/deltacloud-image_builder_service @@ -66,7 +66,7 @@ case "$1" in restart ;; status) - status $BUILDER_PROG + status -p $BUILDER_PID $BUILDER_PROG RETVAL=$? ;; *) diff --git a/conf/deltacloud-portal.conf b/conf/deltacloud-portal.conf deleted file mode 100644 index 6ef80b8..0000000 --- a/conf/deltacloud-portal.conf +++ /dev/null @@ -1,23 +0,0 @@ -NameVirtualHost *:80 -<VirtualHost *:80> - - ErrorLog /etc/httpd/logs/error_log - TransferLog /etc/httpd/logs/access_log - LogLevel warn - - ProxyRequests Off - -Alias /deltacloud/stylesheets "/usr/share/deltacloud-aggregator/public/stylesheets" -Alias /deltacloud/images "/usr/share/deltacloud-aggregator/public/images" -Alias /deltacloud/errors "/usr/share/deltacloud-aggregator/public/" - -ProxyPass /deltacloud/images ! -ProxyPass /deltacloud/stylesheets ! -ProxyPass /deltacloud/errors ! -ProxyPass /deltacloud http://localhost:3000/deltacloud -ProxyPassReverse /deltacloud http://localhost:3000/deltacloud -ProxyPassReverse /deltacloud/images ! -ProxyPassReverse /deltacloud/stylesheets ! -ProxyPassReverse /deltacloud/errors ! - -</VirtualHost> diff --git a/conf/deltacloud-portal.logrotate b/conf/deltacloud-portal.logrotate deleted file mode 100644 index 3d10fd9..0000000 --- a/conf/deltacloud-portal.logrotate +++ /dev/null @@ -1,12 +0,0 @@ -weekly -rotate 52 -compress -missingok -notifempty - -/var/log/deltacloud-aggregator/rails.log /var/log/deltacloud-aggregator/thin.log { - sharedscripts - postrotate - /etc/init.d/deltacloud-aggregator restart - endscript -} diff --git a/deltacloud-aggregator.spec.in b/deltacloud-aggregator.spec.in index dc33036..f05646f 100644 --- a/deltacloud-aggregator.spec.in +++ b/deltacloud-aggregator.spec.in @@ -10,9 +10,6 @@ Group: Applications/System License: GPLv2+ and MIT and BSD URL: http://deltacloud.org -# until official source tarballs exist, checkout from source via -# git clone git://git.fedorahosted.org/deltacloud/portal.git deltacloud-aggregator-0.0.2 -# tar czvf deltacloud-aggregator-0.0.2.tar.gz deltacloud-aggregator-0.0.2 Source0: deltacloud-aggregator-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -116,8 +113,8 @@ mv %{buildroot}/%{app_root}/doc %{buildroot}/%{app_root}/test %{buildroot}/%{doc %{__cp} conf/deltacloud-dbomatic %{buildroot}%{_initrddir} %{__cp} conf/deltacloud-condor_refreshd %{buildroot}%{_initrddir} %{__cp} conf/deltacloud-image_builder_service %{buildroot}%{_initrddir} -%{__cp} conf/deltacloud-portal.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/deltacloud-aggregator.conf -%{__cp} conf/deltacloud-portal.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/deltacloud-aggregator +%{__cp} conf/deltacloud-aggregator-httpd.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/deltacloud-aggregator.conf +%{__cp} conf/deltacloud-aggregator.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/deltacloud-aggregator %{__cp} conf/deltacloud-aggregator.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-aggregator %{__cp} conf/deltacloud-rails.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-rails -- 1.7.3.1 _______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel
