deltacloud-devel March 2010

deltacloud-devel@lists.fedorahosted.org

15 participants
103 discussions

Changes to login, register and profile pages
by jason.guiditta 05 Mar '10

05 Mar '10

[PATCH portal 1/3] Update auth features to reflect changes in design. [PATCH portal 2/3] Extend user model. [PATCH portal 3/3] Extend new user form, initial layout fixes. This series was done in this manner as an example of my proposed format. First patch updates features, showing what I want the app to do. Second and third are small digestible chunks that will make the tests pass by implementing their specifications.

1 3

[PATCH core] no more libexec/
by David Lutterkort 05 Mar '10

05 Mar '10

Hi, I just pushed a change that does 'git mv server/libexec/* server'; there was only one place where an additional change was needed, and that was in deltacloudd. I ran all the tests I could get my hands on, and manually inspected that things are still working. If there is additional trouble, holler. People who have outstanding patches need to adapt them to the change; as far as I know, the main things that are affected are Michal's gem spec (doing this before we commit the gem spec was one of the main reasons to do this now), and the GoGrid driver. For the latter, I'll move it over and commit it. Just as a small reminder: if you need to look at the history of changes across this rename, use 'git log --follow'. David

1 0

[PATCH aggregator] Updated / cleaned up rpm spec, renamed to aggregator
by Mo Morsi 05 Mar '10

05 Mar '10

--- Makefile.am | 4 +- autogen.sh | 2 +- conf/deltacloud-aggregator | 6 +- conf/deltacloud-aggregator.sysconf | 8 +- conf/deltacloud-portal.conf | 6 +- conf/deltacloud-portal.logrotate | 4 +- conf/deltacloud-taskomatic | 6 +- configure.ac | 4 +- deltacloud-aggregator.spec.in | 176 +++++++++++++++++++++++++++++++++ deltacloud-portal.spec.in | 162 ------------------------------ src/config/environments/production.rb | 2 +- src/task-omatic/taskomatic.rb | 2 +- 12 files changed, 198 insertions(+), 184 deletions(-) create mode 100644 deltacloud-aggregator.spec.in delete mode 100644 deltacloud-portal.spec.in diff --git a/Makefile.am b/Makefile.am index e5d97f8..7984035 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,8 +19,8 @@ DELTACLOUD_CACHE_DIR ?= $(HOME)/deltacloud-cache EXTRA_DIST = \ .gitignore \ - deltacloud-portal.spec \ - deltacloud-portal.spec.in \ + deltacloud-aggregator.spec \ + deltacloud-aggregator.spec.in \ conf \ src diff --git a/autogen.sh b/autogen.sh index a58ba56..72f9114 100755 --- a/autogen.sh +++ b/autogen.sh @@ -40,7 +40,7 @@ THEDIR=`pwd` test $die = 1 && exit 1 - test -f deltacloud-portal.spec.in || { + test -f deltacloud-aggregator.spec.in || { echo "You must run this script in the top-level directory" exit 1 } diff --git a/conf/deltacloud-aggregator b/conf/deltacloud-aggregator index b2b9a18..5f14642 100755 --- a/conf/deltacloud-aggregator +++ b/conf/deltacloud-aggregator @@ -13,9 +13,9 @@ [ -r /etc/sysconfig/deltacloud-aggregator ] && . /etc/sysconfig/deltacloud-aggregator RAILS_ENV="${RAILS_ENV:-production}" -DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-portal}" -THIN_LOG="${THIN_LOG:-/var/log/deltacloud-portal/thin.log}" -THIN_PID="${THIN_PID:-/var/run/deltacloud-portal/thin.pid}" +DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-aggregator}" +THIN_LOG="${THIN_LOG:-/var/log/deltacloud-aggregator/thin.log}" +THIN_PID="${THIN_PID:-/var/run/deltacloud-aggregator/thin.pid}" THIN_LOCKFILE="${THIN_LOCKFILE:-/var/lock/subsys/deltacloud-aggregator }" USER="${USER:-dcloud}" GROUP="${GROUP:-dcloud}" diff --git a/conf/deltacloud-aggregator.sysconf b/conf/deltacloud-aggregator.sysconf index 5c94997..73ff168 100644 --- a/conf/deltacloud-aggregator.sysconf +++ b/conf/deltacloud-aggregator.sysconf @@ -1,14 +1,14 @@ # root directory of the Deltacloud Aggregator Rails application -#DELTACLOUD_DIR=/usr/share/deltacloud-portal +#DELTACLOUD_DIR=/usr/share/deltacloud-aggregator # location of the logfile -#THIN_LOG=/var/log/deltacloud-portal/thin.log +#THIN_LOG=/var/log/deltacloud-aggregator/thin.log # location of the lockfile -#THIN_LOCKFILE=/var/lock/subsys/deltacloud-portal +#THIN_LOCKFILE=/var/lock/subsys/deltacloud-aggregator # location of the file containing running process ID -#THIN_PID=/var/run/deltacloud-portal/thin.pid +#THIN_PID=/var/run/deltacloud-aggregator/thin.pid # user and group under which Rails application runs #USER=dcloud diff --git a/conf/deltacloud-portal.conf b/conf/deltacloud-portal.conf index 04df9b7..6ef80b8 100644 --- a/conf/deltacloud-portal.conf +++ b/conf/deltacloud-portal.conf @@ -7,9 +7,9 @@ NameVirtualHost *:80 ProxyRequests Off -Alias /deltacloud/stylesheets "/usr/share/deltacloud-portal/public/stylesheets" -Alias /deltacloud/images "/usr/share/deltacloud-portal/public/images" -Alias /deltacloud/errors "/usr/share/deltacloud-portal/public/" +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 ! diff --git a/conf/deltacloud-portal.logrotate b/conf/deltacloud-portal.logrotate index 92a494f..2269869 100644 --- a/conf/deltacloud-portal.logrotate +++ b/conf/deltacloud-portal.logrotate @@ -4,13 +4,13 @@ compress missingok notifempty -/var/log/deltacloud-portal/taskomatic.log { +/var/log/deltacloud-aggregator/taskomatic.log { postrotate /etc/init.d/deltacloud-taskomatic restart endscript } -/var/log/deltacloud-portal/rails.log /var/log/deltacloud-portal/thin.log { +/var/log/deltacloud-aggregator/rails.log /var/log/deltacloud-aggregator/thin.log { sharedscripts postrotate /etc/init.d/deltacloud-aggregator restart diff --git a/conf/deltacloud-taskomatic b/conf/deltacloud-taskomatic index 7ab952f..c9e2a72 100755 --- a/conf/deltacloud-taskomatic +++ b/conf/deltacloud-taskomatic @@ -5,15 +5,15 @@ # # chkconfig: - 97 03 # description: deltacloud-taskomatic is an essential component of the \ -# deltacloud Portal. +# deltacloud aggregator. # [ -r /etc/sysconfig/deltacloud-rails ] && . /etc/sysconfig/deltacloud-rails export RAILS_ENV="${RAILS_ENV:-production}" -export COBBLER_YML="${COBBLER_YML:-/usr/share/deltacloud-portal/config/cobbler.yml}" +export COBBLER_YML="${COBBLER_YML:-/usr/share/deltacloud-aggregator/config/cobbler.yml}" -DAEMON=/usr/share/deltacloud-portal/task-omatic/taskomatic.rb +DAEMON=/usr/share/deltacloud-aggregator/task-omatic/taskomatic.rb TASKOMATIC_LOCKFILE="${TASKOMATIC_LOCKFILE:-/var/lock/subsys/deltacloud-taskomatic }" . /etc/init.d/functions diff --git a/configure.ac b/configure.ac index 53f1a2e..e11158b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([deltacloud-portal], [0.0.2], [deltacloud-devel(a)lists.fedoraproject.org]) +AC_INIT([deltacloud-aggregator], [0.0.2], [deltacloud-devel(a)lists.fedoraproject.org]) AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability tar-pax]) AC_PROG_CC AC_CONFIG_HEADERS([config.h]) @@ -7,5 +7,5 @@ AC_CONFIG_HEADERS([config.h]) test x"$ac_ct_CC:$CFLAGS" = 'xgcc:-g -O2' \ && CFLAGS="$CFLAGS -Wshadow -Wall -Werror" -AC_CONFIG_FILES([Makefile deltacloud-portal.spec]) +AC_CONFIG_FILES([Makefile deltacloud-aggregator.spec]) AC_OUTPUT diff --git a/deltacloud-aggregator.spec.in b/deltacloud-aggregator.spec.in new file mode 100644 index 0000000..ef0a505 --- /dev/null +++ b/deltacloud-aggregator.spec.in @@ -0,0 +1,176 @@ +%define app_root %{_datadir}/%{name} +%define doc_root %{_datadir}/%{name}-doc + +Name: deltacloud-aggregator +Version: @VERSION@ +Release: 0%{?dist}%{?extra_release} +Summary: The Deltacloud Aggregator + +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) +BuildArch: noarch + +Requires: ruby >= 1.8.1 +Requires: ruby(abi) = 1.8 +Requires: rubygem(rails) >= 2.1.1 +Requires: rubygem(daemons) +Requires: rubygem(gettext_rails) +Requires: postgresql +Requires: postgresql-server +Requires: ruby-postgres + +%package daemons +Summary: Deltacloud Aggregator daemons config +Group: Applications/Internet +License: GPLv2+ +Requires: %{name} = %{version}-%{release} +Requires: httpd >= 2.0 +#Requires: rubygem(thin) >= 1.2.5 +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts + + +%package doc +Summary: Deltacloud Aggregator documentation and test suite +Group: Documentation +Requires: %{name} = %{version}-%{release} + +%description +The Aggregator for Deltacloud. + +%description daemons +The configuration necessary to run and proxy the Deltacloud Aggregator. + +%description doc +Documentation and tests for the Deltacloud Aggregator + +%prep +%setup -q + +%build + +%install +%{__rm} -rf %{buildroot} +%{__mkdir} -p %{buildroot} +%{__mkdir} -p %{buildroot}%{app_root} +%{__mkdir} -p %{buildroot}%{doc_root} +%{__mkdir} -p %{buildroot}%{_initrddir} +%{__mkdir} -p %{buildroot}%{_sysconfdir}/sysconfig +%{__mkdir} -p %{buildroot}%{_sysconfdir}/httpd/conf.d +%{__mkdir} -p %{buildroot}%{_sysconfdir}/logrotate.d + +%{__mkdir} -p %{buildroot}%{_sysconfdir}/%{name} +%{__mkdir} -p %{buildroot}%{_localstatedir}/lib/%{name} +%{__mkdir} -p %{buildroot}%{_localstatedir}/log/%{name} +%{__mkdir} -p %{buildroot}%{_localstatedir}/run/%{name} + +# copy over all of the src directory... +%{__cp} -R src/* %{buildroot}/%{app_root} + +# move documentation to the correct place +mv %{buildroot}/%{app_root}/doc %{buildroot}/%{app_root}/test %{buildroot}/%{doc_root} + +# copy over init scripts and various config +%{__cp} conf/deltacloud-aggregator conf/deltacloud-taskomatic %{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.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-aggregator +%{__cp} conf/deltacloud-rails.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-rails + +# move rails config to /etc, creating symlinks +%{__mv} %{buildroot}%{app_root}/config/database.yml %{buildroot}%{_sysconfdir}/%{name} +%{__mv} %{buildroot}%{app_root}/config/environments/development.rb %{buildroot}%{_sysconfdir}/%{name} +%{__mv} %{buildroot}%{app_root}/config/environments/production.rb %{buildroot}%{_sysconfdir}/%{name} +%{__mv} %{buildroot}%{app_root}/config/environments/test.rb %{buildroot}%{_sysconfdir}/%{name} +%{__ln_s} %{_sysconfdir}/%{name}/database.yml %{buildroot}%{app_root}/config +%{__ln_s} %{_sysconfdir}/%{name}/development.rb %{buildroot}%{app_root}/config/environments +%{__ln_s} %{_sysconfdir}/%{name}/production.rb %{buildroot}%{app_root}/config/environments +%{__ln_s} %{_sysconfdir}/%{name}/test.rb %{buildroot}%{app_root}/config/environments + +# Creating these files now to make sure the logfiles will be owned +# by dcloud:dcloud. This is a temporary workaround while we've still +# got root-owned daemon processes. Once we resolve that issue +# these files will no longer be added explicitly here. +touch %{buildroot}%{_localstatedir}/log/%{name}/mongrel.log +touch %{buildroot}%{_localstatedir}/log/%{name}/rails.log +touch %{buildroot}%{_localstatedir}/log/%{name}/taskomatic.log + +# remove the files not needed for the installation +%{__rm} -f %{buildroot}%{app_root}/task-omatic/.gitignore +%{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.gitignore +%{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.manifest + +%{__rm} -rf %{buildroot}%{app_root}/tmp +%{__mkdir} %{buildroot}%{_localstatedir}/lib/%{name}/tmp +%{__ln_s} %{_localstatedir}/lib/%{name}/tmp %{buildroot}%{app_root}/tmp + + +%clean +%{__rm} -rf %{buildroot} + +#%check +#rake spec + +%pre daemons +getent group dcloud >/dev/null || /usr/sbin/groupadd -g 109 -r dcloud 2>/dev/null || : +getent passwd dcloud >/dev/null || \ + /usr/sbin/useradd -u 109 -g dcloud -c "dcloud" \ + -s /sbin/nologin -r -d /var/dcloud dcloud 2> /dev/null || : + +%post daemons +# Register the httpd service +/sbin/chkconfig --add deltacloud-taskomatic +/sbin/chkconfig --add deltacloud-aggregator + +%preun daemons +if [ $1 = 0 ]; then +/sbin/service deltacloud-taskomatic stop > /dev/null 2>&1 +/sbin/chkconfig --del deltacloud-taskomatic +/sbin/service deltacloud-aggregator stop > /dev/null 2>&1 +/sbin/chkconfig --del deltacloud-aggregator +fi + +%files +%defattr(-,root,root,-) +%{app_root} +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/database.yml +%config(noreplace) %{_sysconfdir}/%{name}/development.rb +%config(noreplace) %{_sysconfdir}/%{name}/production.rb +%config(noreplace) %{_sysconfdir}/%{name}/test.rb +%doc README AUTHORS COPYING + +%files daemons +%defattr(-,root,root,-) +%{_initrddir}/deltacloud-aggregator +%{_initrddir}/deltacloud-taskomatic +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-aggregator +%config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-rails +%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf +%attr(-, dcloud, dcloud) %{_localstatedir}/lib/%{name} +%attr(-, dcloud, dcloud) %{_localstatedir}/run/%{name} +%attr(-, dcloud, dcloud) %{_localstatedir}/log/%{name} +%doc README AUTHORS COPYING + +%files doc +%defattr(-,root,root,-) +%{doc_root} +%doc README AUTHORS COPYING + +%changelog +* Wed Feb 18 2010 Mohammed Morsi <mmorsi(a)redhat.com> - 0.0.2-1 +- renamed portal to aggregator +- updated / cleaned up package + +* Fri Sep 1 2009 <sseago(a)redhat.com> - 0.0.1-1 +- Initial build. + diff --git a/deltacloud-portal.spec.in b/deltacloud-portal.spec.in deleted file mode 100644 index 106d36a..0000000 --- a/deltacloud-portal.spec.in +++ /dev/null @@ -1,162 +0,0 @@ -%define pbuild %{_builddir}/%{name}-%{version} -%define app_root %{_datadir}/%{name} -%define acehome %{_datadir}/ace - -Summary: The Deltacloud Portal -Name: deltacloud-portal -Version: @VERSION@ -Release: 0%{?dist}%{?extra_release} -Source0: http://deltacloud.org/files/%{name}-%{version}.tar.gz -#Entire source code is GPL except for vendor/plugins/will_paginate and -#public/javascripts/jquery.*, which is both MIT and GPL -License: GPLv2+ and MIT and BSD -Group: Applications/System -Requires: ruby >= 1.8.1 -Requires: ruby(abi) = 1.8 -Requires: rubygem(activerecord) >= 2.1.1-2 -Requires: rubygem(activeldap) >= 0.10.0 -Requires: rubygem(rails) >= 2.1.1 -Requires: rubygem(thin) >= 1.2.5 -%if 0%{?fedora} >= 11 -Requires: rubygem(gettext_rails) -%else -Requires: rubygem(gettext) -%endif -Requires: ruby-flexmock -Requires: postgresql-server -Requires: ruby-postgres -Requires: pwgen -Requires: httpd >= 2.0 -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -BuildRequires: ruby >= 1.8.1 -BuildRequires: ruby-devel -BuildRequires: rubygem(gettext) -BuildRequires: rubygem(rake) >= 0.7 -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -URL: http://deltacloud.org/ - -%description -The Portal for deltacloud. - -%prep -%setup -q - -%build - -%install -test "x%{buildroot}" != "x" && rm -rf %{buildroot} -mkdir %{buildroot} - -%{__install} -d -m0755 %{buildroot}%{_bindir} -%{__install} -d -m0755 %{buildroot}%{_datadir} -%{__install} -d -m0755 %{buildroot}%{_sbindir} -%{__install} -d -m0755 %{buildroot}%{_initrddir} -%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/sysconfig -%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/httpd/conf.d -%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/%{name} -%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/db -%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d -%{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/%{name} -%{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/%{name} -%{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/%{name} -%{__install} -d -m0755 %{buildroot}%{app_root} -%{__install} -d -m0755 %{buildroot}/%{acehome} - -# Creating these files now to make sure the logfiles will be owned -# by dcloud:dcloud. This is a temporary workaround while we've still -# got root-owned daemon processes. Once we resolve that issue -# these files will no longer be added explicitly here. -touch %{buildroot}%{_localstatedir}/log/%{name}/thin.log -touch %{buildroot}%{_localstatedir}/log/%{name}/rails.log -touch %{buildroot}%{_localstatedir}/log/%{name}/taskomatic.log -%{__install} -p -m0644 %{pbuild}/conf/%{name}.conf %{buildroot}%{_sysconfdir}/httpd/conf.d -%{__install} -p -m0644 %{pbuild}/conf/%{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} - -%{__install} -Dp -m0755 %{pbuild}/conf/deltacloud-aggregator %{buildroot}%{_initrddir} -%{__install} -Dp -m0644 %{pbuild}/conf/deltacloud-aggregator.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-aggregator -%{__install} -Dp -m0644 %{pbuild}/conf/deltacloud-rails.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-rails -%{__install} -Dp -m0755 %{pbuild}/conf/deltacloud-taskomatic %{buildroot}%{_initrddir} - -# copy over all of the src directory... -%{__cp} -a %{pbuild}/src/* %{buildroot}%{app_root} - - -# move configs to /etc, keeping symlinks for Rails -%{__mv} %{buildroot}%{app_root}/config/database.yml %{buildroot}%{_sysconfdir}/%{name} -%{__mv} %{buildroot}%{app_root}/config/environments/development.rb %{buildroot}%{_sysconfdir}/%{name} -%{__mv} %{buildroot}%{app_root}/config/environments/production.rb %{buildroot}%{_sysconfdir}/%{name} -%{__mv} %{buildroot}%{app_root}/config/environments/test.rb %{buildroot}%{_sysconfdir}/%{name} -%{__ln_s} %{_sysconfdir}/%{name}/database.yml %{buildroot}%{app_root}/config -%{__ln_s} %{_sysconfdir}/%{name}/development.rb %{buildroot}%{app_root}/config/environments -%{__ln_s} %{_sysconfdir}/%{name}/production.rb %{buildroot}%{app_root}/config/environments -%{__ln_s} %{_sysconfdir}/%{name}/test.rb %{buildroot}%{app_root}/config/environments - -# remove the files not needed for the installation -%{__rm} -f %{buildroot}%{app_root}/task-omatic/.gitignore -%{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.gitignore -%{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.manifest - -%{__rm} -rf %{buildroot}%{app_root}/tmp -%{__mkdir} %{buildroot}%{_localstatedir}/lib/%{name}/tmp -%{__ln_s} %{_localstatedir}/lib/%{name}/tmp %{buildroot}%{app_root}/tmp - -%clean -rm -rf %{buildroot} - -%pre -getent group dcloud >/dev/null || /usr/sbin/groupadd -g 109 -r dcloud 2>/dev/null || : -getent passwd dcloud >/dev/null || \ - /usr/sbin/useradd -u 109 -g dcloud -c "dcloud" \ - -s /sbin/nologin -r -d /var/dcloud dcloud 2> /dev/null || : - -%post -# script -%define daemon_chkconfig_post(d:) \ -/sbin/chkconfig --list %{-d*} >& /dev/null \ -LISTRET=$? \ -/sbin/chkconfig --add %{-d*} \ -if [ $LISTRET -ne 0 ]; then \ - /sbin/chkconfig %{-d*} on \ -fi \ -%{nil} - -# if this is the initial RPM install, then we want to turn the new services -# on; otherwise, we respect the choices the administrator already has made. -# check this by seeing if each daemon is already installed -%daemon_chkconfig_post -d deltacloud-aggregator -%daemon_chkconfig_post -d deltacloud-taskomatic - -%preun -if [ "$1" = 0 ] ; then - /sbin/service deltacloud-aggregator stop > /dev/null 2>&1 - /sbin/service deltacloud-taskomatic stop > /dev/null 2>&1 - /sbin/chkconfig --del deltacloud-aggregator - /sbin/chkconfig --del deltacloud-taskomatic -fi - -%files -%defattr(-,root,root,0755) -%{_initrddir}/deltacloud-aggregator -%{_initrddir}/deltacloud-taskomatic -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-aggregator -%config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-rails -%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf -%doc README AUTHORS COPYING -%attr(-, dcloud, dcloud) %{_localstatedir}/lib/%{name} -%attr(-, dcloud, dcloud) %{_localstatedir}/run/%{name} -%attr(-, dcloud, dcloud) %{_localstatedir}/log/%{name} -%{app_root} -%dir %{_sysconfdir}/%{name} -%dir %{_sysconfdir}/%{name}/db -%config(noreplace) %{_sysconfdir}/%{name}/database.yml -%config(noreplace) %{_sysconfdir}/%{name}/development.rb -%config(noreplace) %{_sysconfdir}/%{name}/production.rb -%config(noreplace) %{_sysconfdir}/%{name}/test.rb - -%changelog -* Fri Sep 1 2009 <sseago(a)redhat.com> - 0.0.1-1 -- Initial build. diff --git a/src/config/environments/production.rb b/src/config/environments/production.rb index a080cd0..dc093bf 100644 --- a/src/config/environments/production.rb +++ b/src/config/environments/production.rb @@ -35,4 +35,4 @@ config.action_controller.perform_caching = true # Disable delivery errors, bad email addresses will be ignored # config.action_mailer.raise_delivery_errors = false -config.log_path = "/var/log/deltacloud-portal/rails.log" +config.log_path = "/var/log/deltacloud-aggregator/rails.log" diff --git a/src/task-omatic/taskomatic.rb b/src/task-omatic/taskomatic.rb index 8c51e9b..e066ab3 100755 --- a/src/task-omatic/taskomatic.rb +++ b/src/task-omatic/taskomatic.rb @@ -48,7 +48,7 @@ class TaskOmatic include MonitorMixin - $logfile = '/var/log/deltacloud-portal/taskomatic.log' + $logfile = '/var/log/deltacloud-aggregator/taskomatic.log' def initialize() super() -- 1.6.2.5

2 1

[PATCH aggregator] Edit Pool UI and backend
by Mo Morsi 05 Mar '10

05 Mar '10

--- src/app/controllers/portal_pool_controller.rb | 14 ++++++++++++++ src/app/views/portal_pool/edit.html.erb | 16 ++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) create mode 100644 src/app/views/portal_pool/edit.html.erb diff --git a/src/app/controllers/portal_pool_controller.rb b/src/app/controllers/portal_pool_controller.rb index 5e5ec5e..b1b3d33 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -76,6 +76,20 @@ class PortalPoolController < ApplicationController end end + def edit + @portal_pool = PortalPool.find params[:id] + end + + def update + @portal_pool = PortalPool.find params[:pool_id] + @name = params[:portal_pool][:name] + unless @portal_pool.nil? || @name.nil? + @portal_pool.name = @name + @portal_pool.save! + end + redirect_to :action => 'show', :id => @portal_pool.id + end + def delete end end diff --git a/src/app/views/portal_pool/edit.html.erb b/src/app/views/portal_pool/edit.html.erb new file mode 100644 index 0000000..4701626 --- /dev/null +++ b/src/app/views/portal_pool/edit.html.erb @@ -0,0 +1,16 @@ +<div class="dcloud_form"> + <%= error_messages_for 'portal_pool' %> + + <h2>Edit Pool</h2> + + <% form_tag :action => 'update' do -%> + <fieldset> + <input type="hidden" name="pool_id" value="<%= @portal_pool.id %>" /> + <legend>Pool</legend> + <ul> + <li><label>Name<span>Provide a descriptive name for this pool.</span></label><%= text_field :portal_pool, :name, :value => @portal_pool.name %></li> + </ul> + </fieldset> + <%= submit_tag "Save", :class => "submit" %> + <% end %> +</div> -- 1.6.2.5

2 1

Renamed gemspec for API and fixed deltacloudd
by Michal Fojtik 05 Mar '10

05 Mar '10

Hi, I renamed deltacloud-server to deltacloud-core and fixed 'dirname' in deltacloudd (thx. David)

1 2

[PATCH aggregator] UI and backend to remove accounts from pool
by Mo Morsi 05 Mar '10

05 Mar '10

--- src/app/controllers/portal_pool_controller.rb | 12 +++++++++++ src/app/views/portal_pool/accounts.html.erb | 27 +++++++++++++++++++++++- src/public/stylesheets/dcloud.css | 4 +++ 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/app/controllers/portal_pool_controller.rb b/src/app/controllers/portal_pool_controller.rb index ff1df67..5e5ec5e 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -36,6 +36,18 @@ class PortalPoolController < ApplicationController @pool = PortalPool.find(params[:id]) end + def remove_accounts + pool_id = params[:id] + cloud_accounts = params[:cloud_account_ids] + + unless pool_id.nil? || cloud_accounts.nil? || cloud_accounts.size < 1 + cloud_accounts = cloud_accounts.join(',') + PoolAccount.delete_all(["portal_pool_id = ? AND cloud_account_id IN (#{cloud_accounts})", pool_id]) + end + + redirect_to :action => 'accounts' + end + def new @portal_pool = PortalPool.new @account = CloudAccount.new diff --git a/src/app/views/portal_pool/accounts.html.erb b/src/app/views/portal_pool/accounts.html.erb index b02b124..c7871cf 100644 --- a/src/app/views/portal_pool/accounts.html.erb +++ b/src/app/views/portal_pool/accounts.html.erb @@ -1,9 +1,10 @@ <% if @pool.cloud_accounts.size == 0 %> <h1>There are no accounts to display</h1> <% else %> - <table> + <table id="pool_accounts"> <thead> <tr> + <th/> <th scope="col">Provider</th> <th scope="col">Username</th> </tr> @@ -11,6 +12,7 @@ <tbody> <%(a)pool.cloud_accounts.each {|account| %> <tr> + <td><input type="checkbox" id="cloud_account_<%=account.id%>" class="cloud_account_id" /></td> <td><%= account.provider.name %></td> <td><%= account.username %></td> </tr> @@ -18,4 +20,25 @@ </tbody> </table> <% end %> -<%= link_to "Add an account", {:controller => "cloud_account", :action => "new", :pools => [@pool.id]}, :class => "actionlink" %> +<%= link_to "Add an account", {}, :id => 'add_account_link', :class => 'actionlink' %> +<%= link_to "Remove Accounts", {}, :id => 'remove_account_link', :class => 'actionlink' %> + + +<script type="text/javascript"> + $('#add_account_link').bind('click', function(e){ + }); + + $('#remove_account_link').bind('click', function(e){ + c = confirm("remove account?"); + if(c){ + cloud_account_ids = new Array(); + $('.cloud_account_id:checked').each(function(index){ + cloud_account_ids[index] = this.id.substring(14, this.id.length); + }); + $.post("<%= url_for :action => 'remove_accounts' %>", {'id' : '<%= @pool.id %>', 'cloud_account_ids[]' : cloud_account_ids}); + return true; + } + return false; + }); +</script> + diff --git a/src/public/stylesheets/dcloud.css b/src/public/stylesheets/dcloud.css index e2f47aa..95edf5f 100644 --- a/src/public/stylesheets/dcloud.css +++ b/src/public/stylesheets/dcloud.css @@ -264,3 +264,7 @@ ul#providers li ul li a:hover { .instance_action_list li.first { border-left: none; } + +#pool_accounts th:first-child { + width: 20px; +} -- 1.6.2.5

2 1

Added unit tests for API
by Michal Fojtik 05 Mar '10

05 Mar '10

Hello everyone, I completed a set of unit tests for Sinatra version of API, using Rack::Test. This means, that you don't need to run Sinatra server for running these tests. There is two additional gem required: gem install nokogiri / yum install rubygem-nokogori gem install rack-test After that: 1. rake fixtures (in core/client directory) 2. ./run_tests.sh (in core/server directory) You may see some failures, which will be fixed soon hopefully. Michal

2 4

[PATCH aggregator] Updated / cleaned up rpm spec, renamed to aggregator
by Mo Morsi 05 Mar '10

05 Mar '10

--- Makefile.am | 4 +- autogen.sh | 2 +- configure.ac | 4 +- deltacloud-aggregator.spec.in | 140 +++++++++++++++++++++++++++++++++++ deltacloud-portal.spec.in | 162 ----------------------------------------- 5 files changed, 145 insertions(+), 167 deletions(-) create mode 100644 deltacloud-aggregator.spec.in delete mode 100644 deltacloud-portal.spec.in diff --git a/Makefile.am b/Makefile.am index e5d97f8..7984035 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,8 +19,8 @@ DELTACLOUD_CACHE_DIR ?= $(HOME)/deltacloud-cache EXTRA_DIST = \ .gitignore \ - deltacloud-portal.spec \ - deltacloud-portal.spec.in \ + deltacloud-aggregator.spec \ + deltacloud-aggregator.spec.in \ conf \ src diff --git a/autogen.sh b/autogen.sh index a58ba56..72f9114 100755 --- a/autogen.sh +++ b/autogen.sh @@ -40,7 +40,7 @@ THEDIR=`pwd` test $die = 1 && exit 1 - test -f deltacloud-portal.spec.in || { + test -f deltacloud-aggregator.spec.in || { echo "You must run this script in the top-level directory" exit 1 } diff --git a/configure.ac b/configure.ac index 53f1a2e..e11158b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([deltacloud-portal], [0.0.2], [deltacloud-devel(a)lists.fedoraproject.org]) +AC_INIT([deltacloud-aggregator], [0.0.2], [deltacloud-devel(a)lists.fedoraproject.org]) AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability tar-pax]) AC_PROG_CC AC_CONFIG_HEADERS([config.h]) @@ -7,5 +7,5 @@ AC_CONFIG_HEADERS([config.h]) test x"$ac_ct_CC:$CFLAGS" = 'xgcc:-g -O2' \ && CFLAGS="$CFLAGS -Wshadow -Wall -Werror" -AC_CONFIG_FILES([Makefile deltacloud-portal.spec]) +AC_CONFIG_FILES([Makefile deltacloud-aggregator.spec]) AC_OUTPUT diff --git a/deltacloud-aggregator.spec.in b/deltacloud-aggregator.spec.in new file mode 100644 index 0000000..4d840c4 --- /dev/null +++ b/deltacloud-aggregator.spec.in @@ -0,0 +1,140 @@ +%define app_root %{_datadir}/%{name} +%define doc_root %{_datadir}/%{name}-doc + +Name: deltacloud-aggregator +Version: @VERSION@ +Release: 1%{?dist} +Summary: The Deltacloud Aggregator + +Group: Applications/System +License: GPLv2+ +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) +BuildArch: noarch + +Requires: ruby >= 1.8.1 +Requires: ruby(abi) = 1.8 +Requires: rubygem(rails) >= 2.1.1 +Requires: rubygem(daemons) +Requires: rubygem(gettext_rails) +Requires: postgresql +Requires: postgresql-server +Requires: ruby-postgres + +%package daemons +Summary: Deltacloud Aggregator daemons config +Group: Applications/Internet +License: GPLv2+ +Requires: %{name} = %{version}-%{release} +Requires: httpd >= 2.0 +Requires: rubygem(mongrel) >= 1.0.1 +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts + + +%package doc +Summary: Deltacloud Aggregator documentation and test suite +Group: Documentation +Requires: %{name} = %{version}-%{release} + +%description +The Aggregator for Deltacloud. + +%description daemons +The configuration necessary to run and proxy the Deltacloud Aggregator. + +%description doc +Documentation and tests for the Deltacloud Aggregator + +%prep +%setup -q + +%build + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot} +mkdir -p %{buildroot}%{app_root} +mkdir -p %{buildroot}%{doc_root} +mkdir -p %{buildroot}%{_initrddir} +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig +mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d + +# copy over all of the src directory... +cp -R src/* %{buildroot}/%{app_root} + +# move documentation to the correct place +mv %{buildroot}/%{app_root}/doc %{buildroot}/%{app_root}/test %{buildroot}/%{doc_root} + +# copy over config and init scripts +cp conf/deltacloud-mongrel-rails conf/deltacloud-taskomatic %{buildroot}%{_initrddir} +cp conf/*.sysconf %{buildroot}%{_sysconfdir}/sysconfig +cp conf/deltacloud-portal.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/deltacloud-aggregator.conf +cp conf/deltacloud-portal.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/deltacloud-aggregator + +# remove the files not needed for the installation +rm -f %{buildroot}%{app_root}/task-omatic/.gitignore +rm -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.gitignore +rm -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.manifest +rm -rf %{buildroot}%{app_root}/tmp + +%clean +rm -rf %{buildroot} + +#%check +#rake spec + +%pre daemons +getent group dcloud >/dev/null || /usr/sbin/groupadd -g 109 -r dcloud 2>/dev/null || : +getent passwd dcloud >/dev/null || \ + /usr/sbin/useradd -u 109 -g dcloud -c "dcloud" \ + -s /sbin/nologin -r -d /var/dcloud dcloud 2> /dev/null || : + +%post daemons +# Register the httpd service +/sbin/chkconfig --add deltacloud-taskomatic +/sbin/chkconfig --add deltacloud-mongrel-rails + +%preun daemons +if [ $1 = 0 ]; then +/sbin/service deltacloud-taskomatic stop > /dev/null 2>&1 +/sbin/chkconfig --del deltacloud-taskomatic +/sbin/service deltacloud-mongrel-rails stop > /dev/null 2>&1 +/sbin/chkconfig --del deltacloud-mongrel-rails +fi + +%files +%defattr(-,root,root,-) +%{app_root} +%doc README AUTHORS COPYING + +%files daemons +%defattr(-,root,root,-) +%{_initrddir}/deltacloud-mongrel-rails +%{_initrddir}/deltacloud-taskomatic +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-mongrel-rails.sysconf +%config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-rails.sysconf +%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf +%doc README AUTHORS COPYING + +%files doc +%defattr(-,root,root,-) +%{doc_root} +%doc README AUTHORS COPYING + +%changelog +* Wed Feb 18 2010 Mohammed Morsi <mmorsi(a)redhat.com> - 0.0.2-1 +- renamed portal to aggregator +- updated / cleaned up package + +* Fri Sep 1 2009 <sseago(a)redhat.com> - 0.0.1-1 +- Initial build. + diff --git a/deltacloud-portal.spec.in b/deltacloud-portal.spec.in deleted file mode 100644 index 642da34..0000000 --- a/deltacloud-portal.spec.in +++ /dev/null @@ -1,162 +0,0 @@ -%define pbuild %{_builddir}/%{name}-%{version} -%define app_root %{_datadir}/%{name} -%define acehome %{_datadir}/ace - -Summary: The Deltacloud Portal -Name: deltacloud-portal -Version: @VERSION@ -Release: 0%{?dist}%{?extra_release} -Source0: http://deltacloud.org/files/%{name}-%{version}.tar.gz -#Entire source code is GPL except for vendor/plugins/will_paginate and -#public/javascripts/jquery.*, which is both MIT and GPL -License: GPLv2+ and MIT and BSD -Group: Applications/System -Requires: ruby >= 1.8.1 -Requires: ruby(abi) = 1.8 -Requires: rubygem(activerecord) >= 2.1.1-2 -Requires: rubygem(activeldap) >= 0.10.0 -Requires: rubygem(rails) >= 2.1.1 -Requires: rubygem(mongrel) >= 1.0.1 -%if 0%{?fedora} >= 11 -Requires: rubygem(gettext_rails) -%else -Requires: rubygem(gettext) -%endif -Requires: ruby-flexmock -Requires: postgresql-server -Requires: ruby-postgres -Requires: pwgen -Requires: httpd >= 2.0 -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -BuildRequires: ruby >= 1.8.1 -BuildRequires: ruby-devel -BuildRequires: rubygem(gettext) -BuildRequires: rubygem(rake) >= 0.7 -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -URL: http://deltacloud.org/ - -%description -The Portal for deltacloud. - -%prep -%setup -q - -%build - -%install -test "x%{buildroot}" != "x" && rm -rf %{buildroot} -mkdir %{buildroot} - -%{__install} -d -m0755 %{buildroot}%{_bindir} -%{__install} -d -m0755 %{buildroot}%{_datadir} -%{__install} -d -m0755 %{buildroot}%{_sbindir} -%{__install} -d -m0755 %{buildroot}%{_initrddir} -%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/sysconfig -%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/httpd/conf.d -%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/%{name} -%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/db -%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d -%{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/%{name} -%{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/%{name} -%{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/%{name} -%{__install} -d -m0755 %{buildroot}%{app_root} -%{__install} -d -m0755 %{buildroot}/%{acehome} - -# Creating these files now to make sure the logfiles will be owned -# by dcloud:dcloud. This is a temporary workaround while we've still -# got root-owned daemon processes. Once we resolve that issue -# these files will no longer be added explicitly here. -touch %{buildroot}%{_localstatedir}/log/%{name}/mongrel.log -touch %{buildroot}%{_localstatedir}/log/%{name}/rails.log -touch %{buildroot}%{_localstatedir}/log/%{name}/taskomatic.log -%{__install} -p -m0644 %{pbuild}/conf/%{name}.conf %{buildroot}%{_sysconfdir}/httpd/conf.d -%{__install} -p -m0644 %{pbuild}/conf/%{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} - -%{__install} -Dp -m0755 %{pbuild}/conf/deltacloud-mongrel-rails %{buildroot}%{_initrddir} -%{__install} -Dp -m0644 %{pbuild}/conf/deltacloud-mongrel-rails.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-mongrel-rails -%{__install} -Dp -m0644 %{pbuild}/conf/deltacloud-rails.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-rails -%{__install} -Dp -m0755 %{pbuild}/conf/deltacloud-taskomatic %{buildroot}%{_initrddir} - -# copy over all of the src directory... -%{__cp} -a %{pbuild}/src/* %{buildroot}%{app_root} - - -# move configs to /etc, keeping symlinks for Rails -%{__mv} %{buildroot}%{app_root}/config/database.yml %{buildroot}%{_sysconfdir}/%{name} -%{__mv} %{buildroot}%{app_root}/config/environments/development.rb %{buildroot}%{_sysconfdir}/%{name} -%{__mv} %{buildroot}%{app_root}/config/environments/production.rb %{buildroot}%{_sysconfdir}/%{name} -%{__mv} %{buildroot}%{app_root}/config/environments/test.rb %{buildroot}%{_sysconfdir}/%{name} -%{__ln_s} %{_sysconfdir}/%{name}/database.yml %{buildroot}%{app_root}/config -%{__ln_s} %{_sysconfdir}/%{name}/development.rb %{buildroot}%{app_root}/config/environments -%{__ln_s} %{_sysconfdir}/%{name}/production.rb %{buildroot}%{app_root}/config/environments -%{__ln_s} %{_sysconfdir}/%{name}/test.rb %{buildroot}%{app_root}/config/environments - -# remove the files not needed for the installation -%{__rm} -f %{buildroot}%{app_root}/task-omatic/.gitignore -%{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.gitignore -%{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.manifest - -%{__rm} -rf %{buildroot}%{app_root}/tmp -%{__mkdir} %{buildroot}%{_localstatedir}/lib/%{name}/tmp -%{__ln_s} %{_localstatedir}/lib/%{name}/tmp %{buildroot}%{app_root}/tmp - -%clean -rm -rf %{buildroot} - -%pre -getent group dcloud >/dev/null || /usr/sbin/groupadd -g 109 -r dcloud 2>/dev/null || : -getent passwd dcloud >/dev/null || \ - /usr/sbin/useradd -u 109 -g dcloud -c "dcloud" \ - -s /sbin/nologin -r -d /var/dcloud dcloud 2> /dev/null || : - -%post -# script -%define daemon_chkconfig_post(d:) \ -/sbin/chkconfig --list %{-d*} >& /dev/null \ -LISTRET=$? \ -/sbin/chkconfig --add %{-d*} \ -if [ $LISTRET -ne 0 ]; then \ - /sbin/chkconfig %{-d*} on \ -fi \ -%{nil} - -# if this is the initial RPM install, then we want to turn the new services -# on; otherwise, we respect the choices the administrator already has made. -# check this by seeing if each daemon is already installed -%daemon_chkconfig_post -d deltacloud-mongrel-rails -%daemon_chkconfig_post -d deltacloud-taskomatic - -%preun -if [ "$1" = 0 ] ; then - /sbin/service deltacloud-mongrel-rails stop > /dev/null 2>&1 - /sbin/service deltacloud-taskomatic stop > /dev/null 2>&1 - /sbin/chkconfig --del deltacloud-mongrel-rails - /sbin/chkconfig --del deltacloud-taskomatic -fi - -%files -%defattr(-,root,root,0755) -%{_initrddir}/deltacloud-mongrel-rails -%{_initrddir}/deltacloud-taskomatic -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-mongrel-rails -%config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-rails -%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf -%doc README AUTHORS COPYING -%attr(-, dcloud, dcloud) %{_localstatedir}/lib/%{name} -%attr(-, dcloud, dcloud) %{_localstatedir}/run/%{name} -%attr(-, dcloud, dcloud) %{_localstatedir}/log/%{name} -%{app_root} -%dir %{_sysconfdir}/%{name} -%dir %{_sysconfdir}/%{name}/db -%config(noreplace) %{_sysconfdir}/%{name}/database.yml -%config(noreplace) %{_sysconfdir}/%{name}/development.rb -%config(noreplace) %{_sysconfdir}/%{name}/production.rb -%config(noreplace) %{_sysconfdir}/%{name}/test.rb - -%changelog -* Fri Sep 1 2009 <sseago(a)redhat.com> - 0.0.1-1 -- Initial build. -- 1.6.2.5

2 3

Packaging API server
by Michal Fojtik 05 Mar '10

05 Mar '10

Hi, These two patches are related to packaging API as a gem. First one reworked starter to Ruby, which was needed to get proper path for API libexec directory. Second one added gemspec with all dependencies.

2 6

[PATCH aggregator] Updated / cleaned up rpm spec, renamed to aggregator
by Mo Morsi 05 Mar '10

05 Mar '10

--- Makefile.am | 4 +- autogen.sh | 2 +- configure.ac | 4 +- deltacloud-aggregator.spec.in | 141 +++++++++++++++++++++++++++ deltacloud-portal.spec.in | 210 ++++++++++++++++++----------------------- 5 files changed, 240 insertions(+), 121 deletions(-) create mode 100644 deltacloud-aggregator.spec.in diff --git a/Makefile.am b/Makefile.am index e5d97f8..7984035 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,8 +19,8 @@ DELTACLOUD_CACHE_DIR ?= $(HOME)/deltacloud-cache EXTRA_DIST = \ .gitignore \ - deltacloud-portal.spec \ - deltacloud-portal.spec.in \ + deltacloud-aggregator.spec \ + deltacloud-aggregator.spec.in \ conf \ src diff --git a/autogen.sh b/autogen.sh index a58ba56..72f9114 100755 --- a/autogen.sh +++ b/autogen.sh @@ -40,7 +40,7 @@ THEDIR=`pwd` test $die = 1 && exit 1 - test -f deltacloud-portal.spec.in || { + test -f deltacloud-aggregator.spec.in || { echo "You must run this script in the top-level directory" exit 1 } diff --git a/configure.ac b/configure.ac index 53f1a2e..e11158b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([deltacloud-portal], [0.0.2], [deltacloud-devel(a)lists.fedoraproject.org]) +AC_INIT([deltacloud-aggregator], [0.0.2], [deltacloud-devel(a)lists.fedoraproject.org]) AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability tar-pax]) AC_PROG_CC AC_CONFIG_HEADERS([config.h]) @@ -7,5 +7,5 @@ AC_CONFIG_HEADERS([config.h]) test x"$ac_ct_CC:$CFLAGS" = 'xgcc:-g -O2' \ && CFLAGS="$CFLAGS -Wshadow -Wall -Werror" -AC_CONFIG_FILES([Makefile deltacloud-portal.spec]) +AC_CONFIG_FILES([Makefile deltacloud-aggregator.spec]) AC_OUTPUT diff --git a/deltacloud-aggregator.spec.in b/deltacloud-aggregator.spec.in new file mode 100644 index 0000000..3c0a114 --- /dev/null +++ b/deltacloud-aggregator.spec.in @@ -0,0 +1,141 @@ +%define app_root %{_datadir}/%{name} +%define doc_root %{_datadir}/%{name}-doc + +Name: deltacloud-aggregator +Version: @VERSION@ +Release: 0%{?dist}%{?extra_release} +Summary: The Deltacloud Aggregator + +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) +BuildArch: noarch + +Requires: ruby >= 1.8.1 +Requires: ruby(abi) = 1.8 +Requires: rubygem(rails) >= 2.1.1 +Requires: rubygem(daemons) +Requires: rubygem(gettext_rails) +Requires: postgresql +Requires: postgresql-server +Requires: ruby-postgres + +%package daemons +Summary: Deltacloud Aggregator daemons config +Group: Applications/Internet +License: GPLv2+ +Requires: %{name} = %{version}-%{release} +Requires: httpd >= 2.0 +Requires: rubygem(thin) >= 1.2.5 +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts + + +%package doc +Summary: Deltacloud Aggregator documentation and test suite +Group: Documentation +Requires: %{name} = %{version}-%{release} + +%description +The Aggregator for Deltacloud. + +%description daemons +The configuration necessary to run and proxy the Deltacloud Aggregator. + +%description doc +Documentation and tests for the Deltacloud Aggregator + +%prep +%setup -q + +%build + +%install +%{__rm} -rf %{buildroot} +%{__mkdir} -p %{buildroot} +%{__mkdir} -p %{buildroot}%{app_root} +%{__mkdir} -p %{buildroot}%{doc_root} +%{__mkdir} -p %{buildroot}%{_initrddir} +%{__mkdir} -p %{buildroot}%{_sysconfdir}/sysconfig +%{__mkdir} -p %{buildroot}%{_sysconfdir}/httpd/conf.d +%{__mkdir} -p %{buildroot}%{_sysconfdir}/logrotate.d + +# copy over all of the src directory... +%{__cp} -R src/* %{buildroot}/%{app_root} + +# move documentation to the correct place +mv %{buildroot}/%{app_root}/doc %{buildroot}/%{app_root}/test %{buildroot}/%{doc_root} + +# copy over config and init scripts +%{__cp} conf/deltacloud-aggregator conf/deltacloud-taskomatic %{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.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-aggregator +%{__cp} conf/deltacloud-rails.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-rails + +# remove the files not needed for the installation +%{__rm} -f %{buildroot}%{app_root}/task-omatic/.gitignore +%{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.gitignore +%{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.manifest +%{__rm} -rf %{buildroot}%{app_root}/tmp + +%clean +%{__rm} -rf %{buildroot} + +#%check +#rake spec + +%pre daemons +getent group dcloud >/dev/null || /usr/sbin/groupadd -g 109 -r dcloud 2>/dev/null || : +getent passwd dcloud >/dev/null || \ + /usr/sbin/useradd -u 109 -g dcloud -c "dcloud" \ + -s /sbin/nologin -r -d /var/dcloud dcloud 2> /dev/null || : + +%post daemons +# Register the httpd service +/sbin/chkconfig --add deltacloud-taskomatic +/sbin/chkconfig --add deltacloud-aggregator + +%preun daemons +if [ $1 = 0 ]; then +/sbin/service deltacloud-taskomatic stop > /dev/null 2>&1 +/sbin/chkconfig --del deltacloud-taskomatic +/sbin/service deltacloud-aggregator stop > /dev/null 2>&1 +/sbin/chkconfig --del deltacloud-aggregator +fi + +%files +%defattr(-,root,root,-) +%{app_root} +%doc README AUTHORS COPYING + +%files daemons +%defattr(-,root,root,-) +%{_initrddir}/deltacloud-aggregator +%{_initrddir}/deltacloud-taskomatic +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-aggregator +%config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-rails +%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf +%doc README AUTHORS COPYING + +%files doc +%defattr(-,root,root,-) +%{doc_root} +%doc README AUTHORS COPYING + +%changelog +* Wed Feb 18 2010 Mohammed Morsi <mmorsi(a)redhat.com> - 0.0.2-1 +- renamed portal to aggregator +- updated / cleaned up package + +* Fri Sep 1 2009 <sseago(a)redhat.com> - 0.0.1-1 +- Initial build. + diff --git a/deltacloud-portal.spec.in b/deltacloud-portal.spec.in index 106d36a..986df38 100644 --- a/deltacloud-portal.spec.in +++ b/deltacloud-portal.spec.in @@ -1,45 +1,56 @@ -%define pbuild %{_builddir}/%{name}-%{version} %define app_root %{_datadir}/%{name} -%define acehome %{_datadir}/ace - -Summary: The Deltacloud Portal -Name: deltacloud-portal -Version: @VERSION@ -Release: 0%{?dist}%{?extra_release} -Source0: http://deltacloud.org/files/%{name}-%{version}.tar.gz -#Entire source code is GPL except for vendor/plugins/will_paginate and -#public/javascripts/jquery.*, which is both MIT and GPL -License: GPLv2+ and MIT and BSD -Group: Applications/System +%define doc_root %{_datadir}/%{name}-doc + +Name: deltacloud-aggregator +Version: @VERSION@ +Release: 0%{?dist}%{?extra_release} +Summary: The Deltacloud Aggregator + +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) +BuildArch: noarch + Requires: ruby >= 1.8.1 Requires: ruby(abi) = 1.8 -Requires: rubygem(activerecord) >= 2.1.1-2 -Requires: rubygem(activeldap) >= 0.10.0 Requires: rubygem(rails) >= 2.1.1 -Requires: rubygem(thin) >= 1.2.5 -%if 0%{?fedora} >= 11 +Requires: rubygem(daemons) Requires: rubygem(gettext_rails) -%else -Requires: rubygem(gettext) -%endif -Requires: ruby-flexmock +Requires: postgresql Requires: postgresql-server Requires: ruby-postgres -Requires: pwgen + +%package daemons +Summary: Deltacloud Aggregator daemons config +Group: Applications/Internet +License: GPLv2+ +Requires: %{name} = %{version}-%{release} Requires: httpd >= 2.0 -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -BuildRequires: ruby >= 1.8.1 -BuildRequires: ruby-devel -BuildRequires: rubygem(gettext) -BuildRequires: rubygem(rake) >= 0.7 -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -URL: http://deltacloud.org/ +Requires: rubygem(thin) >= 1.2.5 +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts + + +%package doc +Summary: Deltacloud Aggregator documentation and test suite +Group: Documentation +Requires: %{name} = %{version}-%{release} %description -The Portal for deltacloud. +The Aggregator for Deltacloud. + +%description daemons +The configuration necessary to run and proxy the Deltacloud Aggregator. + +%description doc +Documentation and tests for the Deltacloud Aggregator %prep %setup -q @@ -47,98 +58,66 @@ The Portal for deltacloud. %build %install -test "x%{buildroot}" != "x" && rm -rf %{buildroot} -mkdir %{buildroot} - -%{__install} -d -m0755 %{buildroot}%{_bindir} -%{__install} -d -m0755 %{buildroot}%{_datadir} -%{__install} -d -m0755 %{buildroot}%{_sbindir} -%{__install} -d -m0755 %{buildroot}%{_initrddir} -%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/sysconfig -%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/httpd/conf.d -%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/%{name} -%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/db -%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d -%{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/%{name} -%{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/%{name} -%{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/%{name} -%{__install} -d -m0755 %{buildroot}%{app_root} -%{__install} -d -m0755 %{buildroot}/%{acehome} - -# Creating these files now to make sure the logfiles will be owned -# by dcloud:dcloud. This is a temporary workaround while we've still -# got root-owned daemon processes. Once we resolve that issue -# these files will no longer be added explicitly here. -touch %{buildroot}%{_localstatedir}/log/%{name}/thin.log -touch %{buildroot}%{_localstatedir}/log/%{name}/rails.log -touch %{buildroot}%{_localstatedir}/log/%{name}/taskomatic.log -%{__install} -p -m0644 %{pbuild}/conf/%{name}.conf %{buildroot}%{_sysconfdir}/httpd/conf.d -%{__install} -p -m0644 %{pbuild}/conf/%{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} - -%{__install} -Dp -m0755 %{pbuild}/conf/deltacloud-aggregator %{buildroot}%{_initrddir} -%{__install} -Dp -m0644 %{pbuild}/conf/deltacloud-aggregator.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-aggregator -%{__install} -Dp -m0644 %{pbuild}/conf/deltacloud-rails.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-rails -%{__install} -Dp -m0755 %{pbuild}/conf/deltacloud-taskomatic %{buildroot}%{_initrddir} +%{__rm} -rf %{buildroot} +%{__mkdir} -p %{buildroot} +%{__mkdir} -p %{buildroot}%{app_root} +%{__mkdir} -p %{buildroot}%{doc_root} +%{__mkdir} -p %{buildroot}%{_initrddir} +%{__mkdir} -p %{buildroot}%{_sysconfdir}/sysconfig +%{__mkdir} -p %{buildroot}%{_sysconfdir}/httpd/conf.d +%{__mkdir} -p %{buildroot}%{_sysconfdir}/logrotate.d # copy over all of the src directory... -%{__cp} -a %{pbuild}/src/* %{buildroot}%{app_root} +%{__cp} -R src/* %{buildroot}/%{app_root} +# move documentation to the correct place +mv %{buildroot}/%{app_root}/doc %{buildroot}/%{app_root}/test %{buildroot}/%{doc_root} -# move configs to /etc, keeping symlinks for Rails -%{__mv} %{buildroot}%{app_root}/config/database.yml %{buildroot}%{_sysconfdir}/%{name} -%{__mv} %{buildroot}%{app_root}/config/environments/development.rb %{buildroot}%{_sysconfdir}/%{name} -%{__mv} %{buildroot}%{app_root}/config/environments/production.rb %{buildroot}%{_sysconfdir}/%{name} -%{__mv} %{buildroot}%{app_root}/config/environments/test.rb %{buildroot}%{_sysconfdir}/%{name} -%{__ln_s} %{_sysconfdir}/%{name}/database.yml %{buildroot}%{app_root}/config -%{__ln_s} %{_sysconfdir}/%{name}/development.rb %{buildroot}%{app_root}/config/environments -%{__ln_s} %{_sysconfdir}/%{name}/production.rb %{buildroot}%{app_root}/config/environments -%{__ln_s} %{_sysconfdir}/%{name}/test.rb %{buildroot}%{app_root}/config/environments +# copy over config and init scripts +%{__cp} conf/deltacloud-aggregator conf/deltacloud-taskomatic %{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.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-aggregator +%{__cp} conf/deltacloud-rails.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-rails # remove the files not needed for the installation -%{__rm} -f %{buildroot}%{app_root}/task-omatic/.gitignore -%{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.gitignore -%{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.manifest - +%{__rm} -f %{buildroot}%{app_root}/task-omatic/.gitignore +%{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.gitignore +%{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.manifest %{__rm} -rf %{buildroot}%{app_root}/tmp -%{__mkdir} %{buildroot}%{_localstatedir}/lib/%{name}/tmp -%{__ln_s} %{_localstatedir}/lib/%{name}/tmp %{buildroot}%{app_root}/tmp %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} + +#%check +#rake spec -%pre +%pre daemons getent group dcloud >/dev/null || /usr/sbin/groupadd -g 109 -r dcloud 2>/dev/null || : getent passwd dcloud >/dev/null || \ /usr/sbin/useradd -u 109 -g dcloud -c "dcloud" \ -s /sbin/nologin -r -d /var/dcloud dcloud 2> /dev/null || : -%post -# script -%define daemon_chkconfig_post(d:) \ -/sbin/chkconfig --list %{-d*} >& /dev/null \ -LISTRET=$? \ -/sbin/chkconfig --add %{-d*} \ -if [ $LISTRET -ne 0 ]; then \ - /sbin/chkconfig %{-d*} on \ -fi \ -%{nil} - -# if this is the initial RPM install, then we want to turn the new services -# on; otherwise, we respect the choices the administrator already has made. -# check this by seeing if each daemon is already installed -%daemon_chkconfig_post -d deltacloud-aggregator -%daemon_chkconfig_post -d deltacloud-taskomatic - -%preun -if [ "$1" = 0 ] ; then - /sbin/service deltacloud-aggregator stop > /dev/null 2>&1 - /sbin/service deltacloud-taskomatic stop > /dev/null 2>&1 - /sbin/chkconfig --del deltacloud-aggregator - /sbin/chkconfig --del deltacloud-taskomatic +%post daemons +# Register the httpd service +/sbin/chkconfig --add deltacloud-taskomatic +/sbin/chkconfig --add deltacloud-aggregator + +%preun daemons +if [ $1 = 0 ]; then +/sbin/service deltacloud-taskomatic stop > /dev/null 2>&1 +/sbin/chkconfig --del deltacloud-taskomatic +/sbin/service deltacloud-aggregator stop > /dev/null 2>&1 +/sbin/chkconfig --del deltacloud-aggregator fi %files -%defattr(-,root,root,0755) +%defattr(-,root,root,-) +%{app_root} +%doc README AUTHORS COPYING + +%files daemons +%defattr(-,root,root,-) %{_initrddir}/deltacloud-aggregator %{_initrddir}/deltacloud-taskomatic %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} @@ -146,17 +125,16 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-rails %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %doc README AUTHORS COPYING -%attr(-, dcloud, dcloud) %{_localstatedir}/lib/%{name} -%attr(-, dcloud, dcloud) %{_localstatedir}/run/%{name} -%attr(-, dcloud, dcloud) %{_localstatedir}/log/%{name} -%{app_root} -%dir %{_sysconfdir}/%{name} -%dir %{_sysconfdir}/%{name}/db -%config(noreplace) %{_sysconfdir}/%{name}/database.yml -%config(noreplace) %{_sysconfdir}/%{name}/development.rb -%config(noreplace) %{_sysconfdir}/%{name}/production.rb -%config(noreplace) %{_sysconfdir}/%{name}/test.rb + +%files doc +%defattr(-,root,root,-) +%{doc_root} +%doc README AUTHORS COPYING %changelog +* Wed Feb 18 2010 Mohammed Morsi <mmorsi(a)redhat.com> - 0.0.2-1 +- renamed portal to aggregator +- updated / cleaned up package + * Fri Sep 1 2009 <sseago(a)redhat.com> - 0.0.1-1 - Initial build. -- 1.6.2.5

1 0

← Newer
1
...
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

deltacloud-devel March 2010