[copr] master: move selinux into separate package (60ea263)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 60ea263be467f3806a0608f1f76bc5a2916374ed
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Mar 18 13:22:06 2014 +0100
move selinux into separate package
>---------------------------------------------------------------
copr.spec | 90 ---------------
LICENSE => selinux/LICENSE | 0
copr.spec => selinux/copr-selinux.spec | 120 +++-----------------
.../man}/copr-selinux-enable.8.asciidoc | 0
.../man}/copr-selinux-relabel.8.asciidoc | 0
5 files changed, 14 insertions(+), 196 deletions(-)
diff --git a/copr.spec b/copr.spec
index c88085f..b139d34 100644
--- a/copr.spec
+++ b/copr.spec
@@ -1,11 +1,7 @@
-%global with_server 1
%if 0%{?rhel} < 7 && 0%{?rhel} > 0
%global _pkgdocdir %{_docdir}/%{name}-%{version}
%global __python2 %{__python}
-%global with_server 0
%endif
-%global moduletype apps
-%global modulename copr
Name: copr
Version: 1.28
@@ -40,11 +36,6 @@ BuildRequires: python-argparse
BuildRequires: epydoc
BuildRequires: graphviz
BuildRequires: make
-%if %{with_server}
-#for selinux
-BuildRequires: checkpolicy, selinux-policy-devel
-BuildRequires: policycoreutils >= %{POLICYCOREUTILSVER}
-%endif
%description
COPR is lightweight build system. It allows you to create new project in WebUI,
@@ -67,7 +58,6 @@ and submit new builds and COPR will create yum repository from latests builds.
This package contains command line interface.
-%if %{with_server}
%package doc
Summary: Code documentation for COPR
@@ -78,19 +68,6 @@ and submit new builds and COPR will create yum repository from latests builds.
This package include documentation for COPR code. Mostly useful for developers
only.
-%package selinux
-Summary: SELinux module for COPR
-Requires(post): policycoreutils, libselinux-utils
-Requires(post): policycoreutils-python
-Requires(post): selinux-policy-targeted
-Requires(postun): policycoreutils
-
-%description selinux
-COPR is lightweight build system. It allows you to create new project in WebUI,
-and submit new builds and COPR will create yum repository from latests builds.
-
-This package include SELinux targeted module for COPR
-%endif
%prep
%setup -q
@@ -101,27 +78,12 @@ mv copr_cli/README.rst ./
# convert manages
a2x -d manpage -f manpage man/copr-cli.1.asciidoc
-a2x -d manpage -f manpage man/copr-selinux-enable.8.asciidoc
-a2x -d manpage -f manpage man/copr-selinux-relabel.8.asciidoc
# build documentation
pushd documentation
make %{?_smp_mflags} python
popd
-%if %{with_server}
-#selinux
-pushd selinux
-perl -i -pe 'BEGIN { $VER = join ".", grep /^\d+$/, split /\./, "%{version}.%{release}"; } s!\@\@VERSION\@\@!$VER!g;' %{modulename}.te
-for selinuxvariant in targeted; do
- make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
- bzip2 -9 %{modulename}.pp
- mv %{modulename}.pp.bz2 %{modulename}.pp.bz2.${selinuxvariant}
- make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
-done
-popd
-%endif
-
%install
#copr-cli
@@ -129,52 +91,10 @@ popd
install -d %{buildroot}%{_mandir}/man1
install -p -m 644 man/copr-cli.1 %{buildroot}/%{_mandir}/man1/
-%if %{with_server}
#doc
cp -a documentation/python-doc %{buildroot}%{_pkgdocdir}/
-#selinux
-for selinuxvariant in targeted; do
- install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
- install -p -m 644 selinux/%{modulename}.pp.bz2.${selinuxvariant} \
- %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp.bz2
-done
-# Install SELinux interfaces
-install -d %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}
-install -p -m 644 selinux/%{modulename}.if \
- %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if
-# Install copr-selinux-enable which will be called in %posttrans
-install -d %{buildroot}%{_sbindir}
-install -p -m 755 selinux/%{name}-selinux-enable %{buildroot}%{_sbindir}/%{name}-selinux-enable
-install -p -m 755 selinux/%{name}-selinux-relabel %{buildroot}%{_sbindir}/%{name}-selinux-relabel
-
-install -d %{buildroot}%{_mandir}/man8
-install -p -m 644 man/%{name}-selinux-enable.8 %{buildroot}/%{_mandir}/man8/
-install -p -m 644 man/%{name}-selinux-relabel.8 %{buildroot}/%{_mandir}/man8/
-%endif
-%if %{with_server}
-%post selinux
-if /usr/sbin/selinuxenabled ; then
- %{_sbindir}/%{name}-selinux-enable
-fi
-
-%posttrans selinux
-if /usr/sbin/selinuxenabled ; then
- %{_sbindir}/%{name}-selinux-relabel
-fi
-
-%postun
-# Clean up after package removal
-if [ $1 -eq 0 ]; then
- for selinuxvariant in targeted; do
- /usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \
- && /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} || :
- done
-fi
-%{sbinpath}/restorecon -rvvi %{_sharedstatedir}/copr
-
-%endif # with_server
%files cli
%doc LICENSE README.rst
@@ -182,19 +102,9 @@ fi
%{python_sitelib}/*
%{_mandir}/man1/copr-cli.1*
-%if %{with_server}
%files doc
%doc %{_pkgdocdir}/python-doc
-%files selinux
-%{_datadir}/selinux/*/%{modulename}.pp.bz2
-# empty, do not distribute it for now
-%exclude %{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if
-%{_sbindir}/%{name}-selinux-enable
-%{_sbindir}/%{name}-selinux-relabel
-%{_mandir}/man8/%{name}-selinux-enable.8*
-%{_mandir}/man8/%{name}-selinux-relabel.8*
-%endif # with_server
%changelog
* Thu Feb 27 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.28-1
diff --git a/LICENSE b/selinux/LICENSE
similarity index 100%
copy from LICENSE
copy to selinux/LICENSE
diff --git a/copr.spec b/selinux/copr-selinux.spec
similarity index 88%
copy from copr.spec
copy to selinux/copr-selinux.spec
index c88085f..d90eb82 100644
--- a/copr.spec
+++ b/selinux/copr-selinux.spec
@@ -1,23 +1,21 @@
-%global with_server 1
%if 0%{?rhel} < 7 && 0%{?rhel} > 0
%global _pkgdocdir %{_docdir}/%{name}-%{version}
%global __python2 %{__python}
-%global with_server 0
%endif
%global moduletype apps
%global modulename copr
-Name: copr
+Name: copr-selinux
Version: 1.28
Release: 1%{?dist}
-Summary: Cool Other Package Repo
+Summary: SELinux module for COPR
Group: Applications/Productivity
License: GPLv2+
URL: https://fedorahosted.org/copr/
# Source is created by
# git clone https://git.fedorahosted.org/git/copr.git
-# cd copr
+# cd copr/selinux
# tito build --tgz
# content is same as https://git.fedorahosted.org/cgit/copr.git/snapshot/%{name}-%{version}-1....
# but checksum does not match due different metadata
@@ -26,92 +24,29 @@ Source0: %{name}-%{version}.tar.gz
BuildArch: noarch
BuildRequires: asciidoc
BuildRequires: libxslt
-BuildRequires: util-linux
-BuildRequires: python-setuptools
-BuildRequires: python-requests
-BuildRequires: python2-devel
-%if %{with_server}
-BuildRequires: systemd
-%endif
-%if 0%{?rhel} < 7 && 0%{?rhel} > 0
-BuildRequires: python-argparse
-%endif
-#for doc package
-BuildRequires: epydoc
-BuildRequires: graphviz
-BuildRequires: make
-%if %{with_server}
-#for selinux
BuildRequires: checkpolicy, selinux-policy-devel
BuildRequires: policycoreutils >= %{POLICYCOREUTILSVER}
-%endif
-
-%description
-COPR is lightweight build system. It allows you to create new project in WebUI,
-and submit new builds and COPR will create yum repository from latest builds.
-
-%package cli
-Summary: Command line interface for COPR
-Requires: python-requests
-Requires: python-setuptools
-%if 0%{?rhel} < 6 && 0%{?rhel} > 0
-Group: Applications/Productivity
-%endif
-%if 0%{?rhel} < 7 && 0%{?rhel} > 0
-Requires: python-argparse
-%endif
-
-%description cli
-COPR is lightweight build system. It allows you to create new project in WebUI,
-and submit new builds and COPR will create yum repository from latests builds.
-
-This package contains command line interface.
-
-%if %{with_server}
-%package doc
-Summary: Code documentation for COPR
-
-%description doc
-COPR is lightweight build system. It allows you to create new project in WebUI,
-and submit new builds and COPR will create yum repository from latests builds.
-
-This package include documentation for COPR code. Mostly useful for developers
-only.
-
-%package selinux
-Summary: SELinux module for COPR
Requires(post): policycoreutils, libselinux-utils
Requires(post): policycoreutils-python
Requires(post): selinux-policy-targeted
Requires(postun): policycoreutils
-%description selinux
+
+%description
COPR is lightweight build system. It allows you to create new project in WebUI,
-and submit new builds and COPR will create yum repository from latests builds.
+and submit new builds and COPR will create yum repository from latest builds.
This package include SELinux targeted module for COPR
-%endif
%prep
%setup -q
%build
-mv copr_cli/README.rst ./
-
# convert manages
-a2x -d manpage -f manpage man/copr-cli.1.asciidoc
a2x -d manpage -f manpage man/copr-selinux-enable.8.asciidoc
a2x -d manpage -f manpage man/copr-selinux-relabel.8.asciidoc
-# build documentation
-pushd documentation
-make %{?_smp_mflags} python
-popd
-
-%if %{with_server}
-#selinux
-pushd selinux
perl -i -pe 'BEGIN { $VER = join ".", grep /^\d+$/, split /\./, "%{version}.%{release}"; } s!\@\@VERSION\@\@!$VER!g;' %{modulename}.te
for selinuxvariant in targeted; do
make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
@@ -119,47 +54,32 @@ for selinuxvariant in targeted; do
mv %{modulename}.pp.bz2 %{modulename}.pp.bz2.${selinuxvariant}
make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
done
-popd
-%endif
%install
-
-#copr-cli
-%{__python2} coprcli-setup.py install --root %{buildroot}
-install -d %{buildroot}%{_mandir}/man1
-install -p -m 644 man/copr-cli.1 %{buildroot}/%{_mandir}/man1/
-
-%if %{with_server}
-#doc
-cp -a documentation/python-doc %{buildroot}%{_pkgdocdir}/
-
-#selinux
for selinuxvariant in targeted; do
install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
- install -p -m 644 selinux/%{modulename}.pp.bz2.${selinuxvariant} \
+ install -p -m 644 %{modulename}.pp.bz2.${selinuxvariant} \
%{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp.bz2
done
# Install SELinux interfaces
install -d %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}
-install -p -m 644 selinux/%{modulename}.if \
+install -p -m 644 %{modulename}.if \
%{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if
# Install copr-selinux-enable which will be called in %posttrans
install -d %{buildroot}%{_sbindir}
-install -p -m 755 selinux/%{name}-selinux-enable %{buildroot}%{_sbindir}/%{name}-selinux-enable
-install -p -m 755 selinux/%{name}-selinux-relabel %{buildroot}%{_sbindir}/%{name}-selinux-relabel
+install -p -m 755 %{name}-selinux-enable %{buildroot}%{_sbindir}/%{name}-selinux-enable
+install -p -m 755 %{name}-selinux-relabel %{buildroot}%{_sbindir}/%{name}-selinux-relabel
install -d %{buildroot}%{_mandir}/man8
install -p -m 644 man/%{name}-selinux-enable.8 %{buildroot}/%{_mandir}/man8/
install -p -m 644 man/%{name}-selinux-relabel.8 %{buildroot}/%{_mandir}/man8/
-%endif
-%if %{with_server}
-%post selinux
+%post
if /usr/sbin/selinuxenabled ; then
%{_sbindir}/%{name}-selinux-enable
fi
-%posttrans selinux
+%posttrans
if /usr/sbin/selinuxenabled ; then
%{_sbindir}/%{name}-selinux-relabel
fi
@@ -174,19 +94,8 @@ if [ $1 -eq 0 ]; then
fi
%{sbinpath}/restorecon -rvvi %{_sharedstatedir}/copr
-%endif # with_server
-
-%files cli
-%doc LICENSE README.rst
-%{_bindir}/copr-cli
-%{python_sitelib}/*
-%{_mandir}/man1/copr-cli.1*
-
-%if %{with_server}
-%files doc
-%doc %{_pkgdocdir}/python-doc
-
-%files selinux
+%files
+%doc LICENSE
%{_datadir}/selinux/*/%{modulename}.pp.bz2
# empty, do not distribute it for now
%exclude %{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if
@@ -194,7 +103,6 @@ fi
%{_sbindir}/%{name}-selinux-relabel
%{_mandir}/man8/%{name}-selinux-enable.8*
%{_mandir}/man8/%{name}-selinux-relabel.8*
-%endif # with_server
%changelog
* Thu Feb 27 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.28-1
diff --git a/man/copr-selinux-enable.8.asciidoc b/selinux/man/copr-selinux-enable.8.asciidoc
similarity index 100%
copy from man/copr-selinux-enable.8.asciidoc
copy to selinux/man/copr-selinux-enable.8.asciidoc
diff --git a/man/copr-selinux-relabel.8.asciidoc b/selinux/man/copr-selinux-relabel.8.asciidoc
similarity index 100%
copy from man/copr-selinux-relabel.8.asciidoc
copy to selinux/man/copr-selinux-relabel.8.asciidoc
10 years, 1 month
[copr] master: Automatic commit of package [copr-frontend] release [1.29-1]. (151d36c)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 151d36c234b0bb7eb302f21ac4efb0ee9716fb5c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Mar 18 13:10:08 2014 +0100
Automatic commit of package [copr-frontend] release [1.29-1].
>---------------------------------------------------------------
frontend/copr-frontend.spec | 5 ++++-
rel-eng/packages/copr-frontend | 1 +
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/frontend/copr-frontend.spec b/frontend/copr-frontend.spec
index d064a61..6490cbb 100644
--- a/frontend/copr-frontend.spec
+++ b/frontend/copr-frontend.spec
@@ -5,7 +5,7 @@
%endif
Name: copr-frontend
-Version: 1.28
+Version: 1.29
Release: 1%{?dist}
Summary: Frontend for Copr
@@ -159,6 +159,9 @@ service httpd condrestart
%doc %{_pkgdocdir}/python-doc
%changelog
+* Tue Mar 18 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.29-1
+- move frontend to standalone package
+
* Thu Feb 27 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.28-1
- [backend] - pass lock to Actions
diff --git a/rel-eng/packages/copr-frontend b/rel-eng/packages/copr-frontend
new file mode 100644
index 0000000..fd9a8bd
--- /dev/null
+++ b/rel-eng/packages/copr-frontend
@@ -0,0 +1 @@
+1.29-1 frontend/
10 years, 1 month
[copr] master: move frontend into separate package (5be287b)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 5be287b82ea044d8cbbc2fab547969add126f144
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Mar 18 10:25:04 2014 +0100
move frontend into separate package
>---------------------------------------------------------------
copr.spec | 105 -----------
LICENSE => frontend/LICENSE | 0
.../copr-frontend.spec | 190 +++++++++-----------
.../coprs_frontend}/CONTRIBUTION_GUIDELINES | 0
.../coprs_frontend}/alembic.ini | 0
.../coprs_frontend}/alembic/env.py | 0
.../coprs_frontend}/alembic/script.py.mako | 0
...4b45f5476_remove_fulltext_in_favor_of_whoosh.py | 0
.../versions/246fd2dbf398_add_legal_flag.py | 0
.../versions/294405dfc7c0_add_action_data_fiel.py | 0
.../versions/2a75f0a06d90_add_a_api_login_fiel.py | 0
.../versions/2e30169e58ce_change_api_token_len.py | 0
.../versions/2fa80e062525_add_mock_chroots.py | 0
.../versions/32ba137a3d56_add_token_informatio.py | 0
.../versions/3a035889852c_add_copr_fulltext.py | 0
.../versions/3a415c6392bc_add_buildroot_pkgs_c.py | 0
.../3c3cce7a5fe0_add_copr_desc_and_instruct.py | 0
.../versions/451e9507b866_generalize_action.py | 0
.../versions/4837ad1d96ea_drop_copr_build_coun.py | 0
.../versions/498884ac47db_add_timezone_field.py | 0
.../versions/52e53e7b413e_add_build_chroot.py | 0
.../alembic/versions/544873aa3ba1_add_action.py | 0
.../versions/595a31c145fb_initial_db_setup.py | 0
.../d062c3d9c00_backend_result_to_result.py | 0
.../coprs_frontend}/application | 0
.../coprs_frontend}/config/copr.conf | 0
.../coprs_frontend}/config/copr_devel.conf | 0
.../coprs_frontend}/config/copr_unit_test.conf | 0
.../coprs_frontend}/coprs.conf.example | 0
.../coprs_frontend}/coprs/__init__.py | 0
.../coprs_frontend}/coprs/config.py | 0
.../coprs_frontend}/coprs/constants.py | 0
.../coprs_frontend}/coprs/exceptions.py | 0
.../coprs_frontend}/coprs/filters.py | 0
.../coprs_frontend}/coprs/forms.py | 0
.../coprs_frontend}/coprs/helpers.py | 0
.../coprs_frontend}/coprs/log.py | 0
.../coprs_frontend}/coprs/logic/__init__.py | 0
.../coprs_frontend}/coprs/logic/actions_logic.py | 0
.../coprs_frontend}/coprs/logic/builds_logic.py | 0
.../coprs_frontend}/coprs/logic/coprs_logic.py | 0
.../coprs_frontend}/coprs/logic/users_logic.py | 0
.../coprs_frontend}/coprs/models.py | 0
.../coprs_frontend}/coprs/signals.py | 0
.../coprs_frontend}/coprs/static/README | 0
.../coprs_frontend}/coprs/static/copr.css | 0
.../coprs_frontend}/coprs/static/copr.js | 0
.../coprs_frontend}/coprs/static/copr_logo.png | Bin 3411 -> 3411 bytes
.../coprs_frontend}/coprs/static/default_user.png | Bin 1961 -> 1961 bytes
.../coprs_frontend}/coprs/static/favicon.ico | Bin 3638 -> 3638 bytes
.../coprs/static/header_background.png | Bin 195 -> 195 bytes
.../coprs_frontend}/coprs/static/pink_arrow.png | Bin 382 -> 382 bytes
.../coprs_frontend}/coprs/templates/404.html | 0
.../coprs_frontend}/coprs/templates/_helpers.html | 0
.../coprs/templates/admin/index.html | 0
.../coprs/templates/admin/layout.html | 0
.../coprs/templates/admin/legal-flag.html | 0
.../coprs_frontend}/coprs/templates/api.html | 0
.../coprs/templates/coprs/_coprs_forms.html | 0
.../coprs_frontend}/coprs/templates/coprs/add.html | 0
.../coprs/templates/coprs/copr.repo | 0
.../coprs/templates/coprs/detail.html | 0
.../templates/coprs/detail/_builds_forms.html | 0
.../templates/coprs/detail/_builds_table.html | 0
.../templates/coprs/detail/_permissions_table.html | 0
.../coprs/templates/coprs/detail/add_build.html | 0
.../coprs/templates/coprs/detail/builds.html | 0
.../coprs/templates/coprs/detail/delete.html | 0
.../coprs/templates/coprs/detail/edit.html | 0
.../coprs/templates/coprs/detail/edit2.html | 0
.../coprs/templates/coprs/detail/edit_chroot.html | 0
.../coprs/templates/coprs/detail/monitor.html | 0
.../coprs/templates/coprs/detail/overview.html | 0
.../coprs/templates/coprs/detail/permissions.html | 0
.../coprs/templates/coprs/show.html | 0
.../coprs_frontend}/coprs/templates/layout.html | 0
.../coprs_frontend}/coprs/templates/login.html | 0
.../coprs_frontend}/coprs/views/__init__.py | 0
.../coprs/views/admin_ns/__init__.py | 0
.../coprs/views/admin_ns/admin_general.py | 0
.../coprs_frontend}/coprs/views/api_ns/__init__.py | 0
.../coprs/views/api_ns/api_general.py | 0
.../coprs/views/backend_ns/__init__.py | 0
.../coprs/views/backend_ns/backend_general.py | 0
.../coprs/views/coprs_ns/__init__.py | 0
.../coprs/views/coprs_ns/coprs_builds.py | 0
.../coprs/views/coprs_ns/coprs_chroots.py | 0
.../coprs/views/coprs_ns/coprs_general.py | 0
.../coprs_frontend}/coprs/views/misc.py | 0
.../coprs_frontend}/coprs/whoosheers.py | 0
.../coprs_frontend}/manage.py | 0
.../coprs_frontend}/tests/__init__.py | 0
.../coprs_frontend}/tests/coprs_test_case.py | 0
.../coprs_frontend}/tests/test_helpers.py | 0
.../tests/test_logic/test_builds_logic.py | 0
.../tests/test_logic/test_coprs_logic.py | 0
.../test_views/test_admin/test_admin_general.py | 0
.../test_backend_ns/test_backend_general.py | 0
.../tests/test_views/test_coprs_ns/__init__.py | 0
.../test_views/test_coprs_ns/test_coprs_builds.py | 0
.../test_views/test_coprs_ns/test_coprs_general.py | 0
{backend => frontend}/documentation/Makefile | 2 +-
.../how-to-generate-documentation.txt | 0
103 files changed, 90 insertions(+), 207 deletions(-)
diff --git a/copr.spec b/copr.spec
index c6afb14..c88085f 100644
--- a/copr.spec
+++ b/copr.spec
@@ -1,4 +1,3 @@
-%global with_test 1
%global with_server 1
%if 0%{?rhel} < 7 && 0%{?rhel} > 0
%global _pkgdocdir %{_docdir}/%{name}-%{version}
@@ -51,55 +50,6 @@ BuildRequires: policycoreutils >= %{POLICYCOREUTILSVER}
COPR is lightweight build system. It allows you to create new project in WebUI,
and submit new builds and COPR will create yum repository from latest builds.
-%if %{with_server}
-%package frontend
-Summary: Frontend for COPR
-Requires: httpd
-Requires: mod_wsgi
-Requires: python-alembic
-Requires: python-flask
-Requires: python-flask-openid
-Requires: python-flask-wtf
-Requires: python-flask-sqlalchemy
-Requires: python-flask-script
-Requires: python-flask-whooshee
-#Requires: python-virtualenv
-Requires: python-blinker
-Requires: python-markdown
-Requires: python-psycopg2
-Requires: python-pylibravatar
-Requires: python-whoosh >= 2.5.3
-Requires: pytz
-# for tests:
-Requires: pytest
-Requires: python-flexmock
-Requires: python-decorator
-Requires: yum
-%if 0%{?rhel} < 7 && 0%{?rhel} > 0
-BuildRequires: python-argparse
-%endif
-# check
-BuildRequires: python-flask
-BuildRequires: python-flask-script
-BuildRequires: python-flask-sqlalchemy
-BuildRequires: python-flask-openid
-BuildRequires: python-flask-whooshee
-BuildRequires: python-pylibravatar
-BuildRequires: python-flask-wtf
-BuildRequires: pytest
-BuildRequires: yum
-BuildRequires: python-flexmock
-BuildRequires: python-decorator
-BuildRequires: python-markdown
-BuildRequires: pytz
-
-%description frontend
-COPR is lightweight build system. It allows you to create new project in WebUI,
-and submit new builds and COPR will create yum repository from latests builds.
-
-This package contains frontend.
-%endif # with_server
-
%package cli
Summary: Command line interface for COPR
Requires: python-requests
@@ -174,24 +124,6 @@ popd
%install
-%if %{with_server}
-#frontend
-install -d %{buildroot}%{_sysconfdir}
-install -d %{buildroot}%{_datadir}/copr/coprs_frontend
-install -d %{buildroot}%{_sharedstatedir}/copr/data/openid_store
-install -d %{buildroot}%{_sharedstatedir}/copr/data/openid_store/associations
-install -d %{buildroot}%{_sharedstatedir}/copr/data/openid_store/nonces
-install -d %{buildroot}%{_sharedstatedir}/copr/data/openid_store/temp
-install -d %{buildroot}%{_sharedstatedir}/copr/data/whooshee
-install -d %{buildroot}%{_sharedstatedir}/copr/data/whooshee/copr_user_whoosheer
-
-cp -a coprs_frontend/* %{buildroot}%{_datadir}/copr/coprs_frontend
-mv %{buildroot}%{_datadir}/copr/coprs_frontend/coprs.conf.example ./
-mv %{buildroot}%{_datadir}/copr/coprs_frontend/config/* %{buildroot}%{_sysconfdir}/copr
-rm %{buildroot}%{_datadir}/copr/coprs_frontend/CONTRIBUTION_GUIDELINES
-touch %{buildroot}%{_sharedstatedir}/copr/data/copr.db
-%endif # with_server
-
#copr-cli
%{__python2} coprcli-setup.py install --root %{buildroot}
install -d %{buildroot}%{_mandir}/man1
@@ -200,7 +132,6 @@ install -p -m 644 man/copr-cli.1 %{buildroot}/%{_mandir}/man1/
%if %{with_server}
#doc
cp -a documentation/python-doc %{buildroot}%{_pkgdocdir}/
-cp -a playbooks %{buildroot}%{_pkgdocdir}/
#selinux
for selinuxvariant in targeted; do
@@ -222,24 +153,7 @@ install -p -m 644 man/%{name}-selinux-enable.8 %{buildroot}/%{_mandir}/man8/
install -p -m 644 man/%{name}-selinux-relabel.8 %{buildroot}/%{_mandir}/man8/
%endif
-%check
-%if %{with_test} && %{with_server} && %{_arch} == "x86_64"
- pushd coprs_frontend
- rm -rf /tmp/copr.db /tmp/whooshee || :
- COPR_CONFIG="$(pwd)/config/copr_unit_test.conf" ./manage.py test
- popd
-%endif
-
%if %{with_server}
-%pre frontend
-getent group copr-fe >/dev/null || groupadd -r copr-fe
-getent passwd copr-fe >/dev/null || \
-useradd -r -g copr-fe -G copr-fe -d %{_datadir}/copr/coprs_frontend -s /bin/bash -c "COPR frontend user" copr-fe
-/usr/bin/passwd -l copr-fe >/dev/null
-
-%post frontend
-service httpd condrestart
-
%post selinux
if /usr/sbin/selinuxenabled ; then
%{_sbindir}/%{name}-selinux-enable
@@ -260,25 +174,6 @@ if [ $1 -eq 0 ]; then
fi
%{sbinpath}/restorecon -rvvi %{_sharedstatedir}/copr
-%files frontend
-%doc LICENSE coprs.conf.example copr-setup.txt
-%dir %{_datadir}/copr
-%dir %{_sysconfdir}/copr
-%dir %{_sharedstatedir}/copr
-%{_datadir}/copr/coprs_frontend
-
-%defattr(-, copr-fe, copr-fe, -)
-%dir %{_sharedstatedir}/copr/data
-%dir %{_sharedstatedir}/copr/data/openid_store
-%dir %{_sharedstatedir}/copr/data/whooshee
-%dir %{_sharedstatedir}/copr/data/whooshee/copr_user_whoosheer
-
-%ghost %{_sharedstatedir}/copr/data/copr.db
-
-%defattr(600, copr-fe, copr-fe, 700)
-%config(noreplace) %{_sysconfdir}/copr/copr.conf
-%config(noreplace) %{_sysconfdir}/copr/copr_devel.conf
-%config(noreplace) %{_sysconfdir}/copr/copr_unit_test.conf
%endif # with_server
%files cli
diff --git a/LICENSE b/frontend/LICENSE
similarity index 100%
copy from LICENSE
copy to frontend/LICENSE
diff --git a/backend/copr-backend.spec b/frontend/copr-frontend.spec
similarity index 84%
copy from backend/copr-backend.spec
copy to frontend/copr-frontend.spec
index 2d96f8e..d064a61 100644
--- a/backend/copr-backend.spec
+++ b/frontend/copr-frontend.spec
@@ -1,18 +1,20 @@
+%global with_test 1
%if 0%{?rhel} < 7 && 0%{?rhel} > 0
%global _pkgdocdir %{_docdir}/%{name}-%{version}
+%global __python2 %{__python}
%endif
-Name: copr-backend
-Version: 1.29
+Name: copr-frontend
+Version: 1.28
Release: 1%{?dist}
-Summary: Backend for Copr
+Summary: Frontend for Copr
Group: Applications/Productivity
License: GPLv2+
URL: https://fedorahosted.org/copr/
# Source is created by
# git clone https://git.fedorahosted.org/git/copr.git
-# cd copr/backend
+# cd copr/frontend
# tito build --tgz
Source0: %{name}-%{version}.tar.gz
@@ -32,35 +34,53 @@ BuildRequires: epydoc
BuildRequires: graphviz
BuildRequires: make
-Requires: ansible >= 1.2
-Requires: lighttpd
-Requires: euca2ools
-Requires: rsync
-Requires: openssh-clients
-Requires: mock
-Requires: yum-utils
-Requires: createrepo_c >= 0.2.1-3
-Requires: python-bunch
-Requires: python-daemon
-Requires: python-lockfile
-Requires: python-requests
-Requires: python-setproctitle
-Requires: logrotate
-Requires: fedmsg
-Requires: gawk
-Requires: crontabs
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
+Requires: httpd
+Requires: mod_wsgi
+Requires: python-alembic
+Requires: python-flask
+Requires: python-flask-openid
+Requires: python-flask-wtf
+Requires: python-flask-sqlalchemy
+Requires: python-flask-script
+Requires: python-flask-whooshee
+#Requires: python-virtualenv
+Requires: python-blinker
+Requires: python-markdown
+Requires: python-psycopg2
+Requires: python-pylibravatar
+Requires: python-whoosh >= 2.5.3
+Requires: pytz
+# for tests:
+Requires: pytest
+Requires: python-flexmock
+Requires: python-decorator
+Requires: yum
+%if 0%{?rhel} < 7 && 0%{?rhel} > 0
+BuildRequires: python-argparse
+%endif
+# check
+BuildRequires: python-flask
+BuildRequires: python-flask-script
+BuildRequires: python-flask-sqlalchemy
+BuildRequires: python-flask-openid
+BuildRequires: python-flask-whooshee
+BuildRequires: python-pylibravatar
+BuildRequires: python-flask-wtf
+BuildRequires: pytest
+BuildRequires: yum
+BuildRequires: python-flexmock
+BuildRequires: python-decorator
+BuildRequires: python-markdown
+BuildRequires: pytz
%description
COPR is lightweight build system. It allows you to create new project in WebUI,
-and submit new builds and COPR will create yum repository from latest builds.
+and submit new builds and COPR will create yum repository from latests builds.
-This package contains backend.
+This package contains frontend.
%package doc
-Summary: Code documentation for COPR backend
+Summary: Code documentation for COPR
%description doc
COPR is lightweight build system. It allows you to create new project in WebUI,
@@ -81,96 +101,64 @@ popd
%install
-install -d %{buildroot}%{_sharedstatedir}/copr
-install -d %{buildroot}%{_sharedstatedir}/copr/jobs
-install -d %{buildroot}%{_sharedstatedir}/copr/public_html/results
-install -d %{buildroot}%{_var}/log/copr
-install -d %{buildroot}%{_var}/log/copr/workers/
-install -d %{buildroot}%{_pkgdocdir}/lighttpd/
-install -d %{buildroot}%{_datadir}/copr/backend
install -d %{buildroot}%{_sysconfdir}/copr
-install -d %{buildroot}%{_sysconfdir}/logrotate.d/
-install -d %{buildroot}%{_unitdir}
-install -d %{buildroot}/%{_var}/log/copr-backend
-install -d %{buildroot}/%{_var}/run/copr-backend/
-install -d %{buildroot}/%{_tmpfilesdir}
-install -d %{buildroot}/%{_sbindir}
-install -d %{buildroot}%{_sysconfdir}/cron.daily
-
-cp -a backend/* %{buildroot}%{_datadir}/copr/backend
-cp -a copr-be.py %{buildroot}%{_datadir}/copr/
-cp -a copr-be.conf.example %{buildroot}%{_sysconfdir}/copr/copr-be.conf
-install -p -m 755 copr-prune-repo %{buildroot}%{_sbindir}/copr-prune-repo
-install -p -m 750 crontab/copr-backend %{buildroot}%{_sysconfdir}/cron.daily/copr-backend
-
-cp -a dist/lighttpd/* %{buildroot}%{_pkgdocdir}/lighttpd/
-cp -a logrotate/* %{buildroot}%{_sysconfdir}/logrotate.d/
-cp -a tmpfiles.d/* %{buildroot}/%{_tmpfilesdir}
-
-# for ghost files
-touch %{buildroot}%{_var}/log/copr/copr.log
-for i in `seq 7`; do
- touch %{buildroot}%{_var}/log/copr/workers/worker-$i.log
-done
-touch %{buildroot}%{_var}/run/copr-backend/copr-be.pid
-
-install -m 0644 copr-backend.service %{buildroot}/%{_unitdir}/
-
-#doc
+install -d %{buildroot}%{_datadir}/copr/coprs_frontend
+install -d %{buildroot}%{_sharedstatedir}/copr/data/openid_store
+install -d %{buildroot}%{_sharedstatedir}/copr/data/openid_store/associations
+install -d %{buildroot}%{_sharedstatedir}/copr/data/openid_store/nonces
+install -d %{buildroot}%{_sharedstatedir}/copr/data/openid_store/temp
+install -d %{buildroot}%{_sharedstatedir}/copr/data/whooshee
+install -d %{buildroot}%{_sharedstatedir}/copr/data/whooshee/copr_user_whoosheer
+
+cp -a coprs_frontend/* %{buildroot}%{_datadir}/copr/coprs_frontend
+mv %{buildroot}%{_datadir}/copr/coprs_frontend/coprs.conf.example ./
+mv %{buildroot}%{_datadir}/copr/coprs_frontend/config/* %{buildroot}%{_sysconfdir}/copr
+rm %{buildroot}%{_datadir}/copr/coprs_frontend/CONTRIBUTION_GUIDELINES
+touch %{buildroot}%{_sharedstatedir}/copr/data/copr.db
+
cp -a documentation/python-doc %{buildroot}%{_pkgdocdir}/
-cp -a playbooks %{buildroot}%{_pkgdocdir}/
+
+%check
+%if %{with_test} && %{_arch} == "x86_64"
+ pushd coprs_frontend
+ rm -rf /tmp/copr.db /tmp/whooshee || :
+ COPR_CONFIG="$(pwd)/config/copr_unit_test.conf" ./manage.py test
+ popd
+%endif
%pre
-getent group copr >/dev/null || groupadd -r copr
-getent passwd copr >/dev/null || \
-useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr
-/usr/bin/passwd -l copr >/dev/null
+getent group copr-fe >/dev/null || groupadd -r copr-fe
+getent passwd copr-fe >/dev/null || \
+useradd -r -g copr-fe -G copr-fe -d %{_datadir}/copr/coprs_frontend -s /bin/bash -c "COPR frontend user" copr-fe
+/usr/bin/passwd -l copr-fe >/dev/null
%post
-%systemd_post copr-backend.service
-
-%preun
-%systemd_preun copr-backend.service
-
-%postun
-%systemd_postun_with_restart copr-backend.service
+service httpd condrestart
%files
-%doc LICENSE
+%doc LICENSE coprs.conf.example
%dir %{_datadir}/copr
-%dir %{_sharedstatedir}/copr
-%dir %attr(0755, copr, copr) %{_sharedstatedir}/copr/jobs/
-%dir %attr(0755, copr, copr) %{_sharedstatedir}/copr/public_html/
-%dir %attr(0755, copr, copr) %{_sharedstatedir}/copr/public_html/results
-%dir %attr(0755, copr, copr) %{_var}/log/copr
-%dir %attr(0755, copr, copr) %{_var}/log/copr/workers
-%dir %attr(0755, copr, copr) %{_var}/run/copr-backend
-
-%ghost %{_var}/log/copr/copr.log
-%ghost %{_var}/log/copr/workers/worker-*.log
-%ghost %{_var}/run/copr-backend/copr-be.pid
-
-%config(noreplace) %{_sysconfdir}/logrotate.d/copr-backend
-%dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/lighttpd
-%doc %{_pkgdocdir}/playbooks
%dir %{_sysconfdir}/copr
-%config(noreplace) %attr(0640, root, copr) %{_sysconfdir}/copr/copr-be.conf
-%{_unitdir}/copr-backend.service
-%{_tmpfilesdir}/copr-backend.conf
-%{_sbindir}/copr-prune-repo
-%config(noreplace) %{_sysconfdir}/cron.daily/copr-backend
+%dir %{_sharedstatedir}/copr
+%{_datadir}/copr/coprs_frontend
-%{_datadir}/copr/backend
-%{_datadir}/copr/copr-be.py*
+%defattr(-, copr-fe, copr-fe, -)
+%dir %{_sharedstatedir}/copr/data
+%dir %{_sharedstatedir}/copr/data/openid_store
+%dir %{_sharedstatedir}/copr/data/whooshee
+%dir %{_sharedstatedir}/copr/data/whooshee/copr_user_whoosheer
+
+%ghost %{_sharedstatedir}/copr/data/copr.db
+
+%defattr(600, copr-fe, copr-fe, 700)
+%config(noreplace) %{_sysconfdir}/copr/copr.conf
+%config(noreplace) %{_sysconfdir}/copr/copr_devel.conf
+%config(noreplace) %{_sysconfdir}/copr/copr_unit_test.conf
%files doc
%doc %{_pkgdocdir}/python-doc
%changelog
-* Tue Mar 18 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.29-1
-- move backend into separate package
-
* Thu Feb 27 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.28-1
- [backend] - pass lock to Actions
diff --git a/coprs_frontend/CONTRIBUTION_GUIDELINES b/frontend/coprs_frontend/CONTRIBUTION_GUIDELINES
similarity index 100%
rename from coprs_frontend/CONTRIBUTION_GUIDELINES
rename to frontend/coprs_frontend/CONTRIBUTION_GUIDELINES
diff --git a/coprs_frontend/alembic.ini b/frontend/coprs_frontend/alembic.ini
similarity index 100%
rename from coprs_frontend/alembic.ini
rename to frontend/coprs_frontend/alembic.ini
diff --git a/coprs_frontend/alembic/env.py b/frontend/coprs_frontend/alembic/env.py
similarity index 100%
rename from coprs_frontend/alembic/env.py
rename to frontend/coprs_frontend/alembic/env.py
diff --git a/coprs_frontend/alembic/script.py.mako b/frontend/coprs_frontend/alembic/script.py.mako
similarity index 100%
rename from coprs_frontend/alembic/script.py.mako
rename to frontend/coprs_frontend/alembic/script.py.mako
diff --git a/coprs_frontend/alembic/versions/1ee4b45f5476_remove_fulltext_in_favor_of_whoosh.py b/frontend/coprs_frontend/alembic/versions/1ee4b45f5476_remove_fulltext_in_favor_of_whoosh.py
similarity index 100%
rename from coprs_frontend/alembic/versions/1ee4b45f5476_remove_fulltext_in_favor_of_whoosh.py
rename to frontend/coprs_frontend/alembic/versions/1ee4b45f5476_remove_fulltext_in_favor_of_whoosh.py
diff --git a/coprs_frontend/alembic/versions/246fd2dbf398_add_legal_flag.py b/frontend/coprs_frontend/alembic/versions/246fd2dbf398_add_legal_flag.py
similarity index 100%
rename from coprs_frontend/alembic/versions/246fd2dbf398_add_legal_flag.py
rename to frontend/coprs_frontend/alembic/versions/246fd2dbf398_add_legal_flag.py
diff --git a/coprs_frontend/alembic/versions/294405dfc7c0_add_action_data_fiel.py b/frontend/coprs_frontend/alembic/versions/294405dfc7c0_add_action_data_fiel.py
similarity index 100%
rename from coprs_frontend/alembic/versions/294405dfc7c0_add_action_data_fiel.py
rename to frontend/coprs_frontend/alembic/versions/294405dfc7c0_add_action_data_fiel.py
diff --git a/coprs_frontend/alembic/versions/2a75f0a06d90_add_a_api_login_fiel.py b/frontend/coprs_frontend/alembic/versions/2a75f0a06d90_add_a_api_login_fiel.py
similarity index 100%
rename from coprs_frontend/alembic/versions/2a75f0a06d90_add_a_api_login_fiel.py
rename to frontend/coprs_frontend/alembic/versions/2a75f0a06d90_add_a_api_login_fiel.py
diff --git a/coprs_frontend/alembic/versions/2e30169e58ce_change_api_token_len.py b/frontend/coprs_frontend/alembic/versions/2e30169e58ce_change_api_token_len.py
similarity index 100%
rename from coprs_frontend/alembic/versions/2e30169e58ce_change_api_token_len.py
rename to frontend/coprs_frontend/alembic/versions/2e30169e58ce_change_api_token_len.py
diff --git a/coprs_frontend/alembic/versions/2fa80e062525_add_mock_chroots.py b/frontend/coprs_frontend/alembic/versions/2fa80e062525_add_mock_chroots.py
similarity index 100%
rename from coprs_frontend/alembic/versions/2fa80e062525_add_mock_chroots.py
rename to frontend/coprs_frontend/alembic/versions/2fa80e062525_add_mock_chroots.py
diff --git a/coprs_frontend/alembic/versions/32ba137a3d56_add_token_informatio.py b/frontend/coprs_frontend/alembic/versions/32ba137a3d56_add_token_informatio.py
similarity index 100%
rename from coprs_frontend/alembic/versions/32ba137a3d56_add_token_informatio.py
rename to frontend/coprs_frontend/alembic/versions/32ba137a3d56_add_token_informatio.py
diff --git a/coprs_frontend/alembic/versions/3a035889852c_add_copr_fulltext.py b/frontend/coprs_frontend/alembic/versions/3a035889852c_add_copr_fulltext.py
similarity index 100%
rename from coprs_frontend/alembic/versions/3a035889852c_add_copr_fulltext.py
rename to frontend/coprs_frontend/alembic/versions/3a035889852c_add_copr_fulltext.py
diff --git a/coprs_frontend/alembic/versions/3a415c6392bc_add_buildroot_pkgs_c.py b/frontend/coprs_frontend/alembic/versions/3a415c6392bc_add_buildroot_pkgs_c.py
similarity index 100%
rename from coprs_frontend/alembic/versions/3a415c6392bc_add_buildroot_pkgs_c.py
rename to frontend/coprs_frontend/alembic/versions/3a415c6392bc_add_buildroot_pkgs_c.py
diff --git a/coprs_frontend/alembic/versions/3c3cce7a5fe0_add_copr_desc_and_instruct.py b/frontend/coprs_frontend/alembic/versions/3c3cce7a5fe0_add_copr_desc_and_instruct.py
similarity index 100%
rename from coprs_frontend/alembic/versions/3c3cce7a5fe0_add_copr_desc_and_instruct.py
rename to frontend/coprs_frontend/alembic/versions/3c3cce7a5fe0_add_copr_desc_and_instruct.py
diff --git a/coprs_frontend/alembic/versions/451e9507b866_generalize_action.py b/frontend/coprs_frontend/alembic/versions/451e9507b866_generalize_action.py
similarity index 100%
rename from coprs_frontend/alembic/versions/451e9507b866_generalize_action.py
rename to frontend/coprs_frontend/alembic/versions/451e9507b866_generalize_action.py
diff --git a/coprs_frontend/alembic/versions/4837ad1d96ea_drop_copr_build_coun.py b/frontend/coprs_frontend/alembic/versions/4837ad1d96ea_drop_copr_build_coun.py
similarity index 100%
rename from coprs_frontend/alembic/versions/4837ad1d96ea_drop_copr_build_coun.py
rename to frontend/coprs_frontend/alembic/versions/4837ad1d96ea_drop_copr_build_coun.py
diff --git a/coprs_frontend/alembic/versions/498884ac47db_add_timezone_field.py b/frontend/coprs_frontend/alembic/versions/498884ac47db_add_timezone_field.py
similarity index 100%
rename from coprs_frontend/alembic/versions/498884ac47db_add_timezone_field.py
rename to frontend/coprs_frontend/alembic/versions/498884ac47db_add_timezone_field.py
diff --git a/coprs_frontend/alembic/versions/52e53e7b413e_add_build_chroot.py b/frontend/coprs_frontend/alembic/versions/52e53e7b413e_add_build_chroot.py
similarity index 100%
rename from coprs_frontend/alembic/versions/52e53e7b413e_add_build_chroot.py
rename to frontend/coprs_frontend/alembic/versions/52e53e7b413e_add_build_chroot.py
diff --git a/coprs_frontend/alembic/versions/544873aa3ba1_add_action.py b/frontend/coprs_frontend/alembic/versions/544873aa3ba1_add_action.py
similarity index 100%
rename from coprs_frontend/alembic/versions/544873aa3ba1_add_action.py
rename to frontend/coprs_frontend/alembic/versions/544873aa3ba1_add_action.py
diff --git a/coprs_frontend/alembic/versions/595a31c145fb_initial_db_setup.py b/frontend/coprs_frontend/alembic/versions/595a31c145fb_initial_db_setup.py
similarity index 100%
rename from coprs_frontend/alembic/versions/595a31c145fb_initial_db_setup.py
rename to frontend/coprs_frontend/alembic/versions/595a31c145fb_initial_db_setup.py
diff --git a/coprs_frontend/alembic/versions/d062c3d9c00_backend_result_to_result.py b/frontend/coprs_frontend/alembic/versions/d062c3d9c00_backend_result_to_result.py
similarity index 100%
rename from coprs_frontend/alembic/versions/d062c3d9c00_backend_result_to_result.py
rename to frontend/coprs_frontend/alembic/versions/d062c3d9c00_backend_result_to_result.py
diff --git a/coprs_frontend/application b/frontend/coprs_frontend/application
similarity index 100%
rename from coprs_frontend/application
rename to frontend/coprs_frontend/application
diff --git a/coprs_frontend/config/copr.conf b/frontend/coprs_frontend/config/copr.conf
similarity index 100%
rename from coprs_frontend/config/copr.conf
rename to frontend/coprs_frontend/config/copr.conf
diff --git a/coprs_frontend/config/copr_devel.conf b/frontend/coprs_frontend/config/copr_devel.conf
similarity index 100%
rename from coprs_frontend/config/copr_devel.conf
rename to frontend/coprs_frontend/config/copr_devel.conf
diff --git a/coprs_frontend/config/copr_unit_test.conf b/frontend/coprs_frontend/config/copr_unit_test.conf
similarity index 100%
rename from coprs_frontend/config/copr_unit_test.conf
rename to frontend/coprs_frontend/config/copr_unit_test.conf
diff --git a/coprs_frontend/coprs.conf.example b/frontend/coprs_frontend/coprs.conf.example
similarity index 100%
rename from coprs_frontend/coprs.conf.example
rename to frontend/coprs_frontend/coprs.conf.example
diff --git a/coprs_frontend/coprs/__init__.py b/frontend/coprs_frontend/coprs/__init__.py
similarity index 100%
rename from coprs_frontend/coprs/__init__.py
rename to frontend/coprs_frontend/coprs/__init__.py
diff --git a/coprs_frontend/coprs/config.py b/frontend/coprs_frontend/coprs/config.py
similarity index 100%
rename from coprs_frontend/coprs/config.py
rename to frontend/coprs_frontend/coprs/config.py
diff --git a/coprs_frontend/coprs/constants.py b/frontend/coprs_frontend/coprs/constants.py
similarity index 100%
rename from coprs_frontend/coprs/constants.py
rename to frontend/coprs_frontend/coprs/constants.py
diff --git a/coprs_frontend/coprs/exceptions.py b/frontend/coprs_frontend/coprs/exceptions.py
similarity index 100%
rename from coprs_frontend/coprs/exceptions.py
rename to frontend/coprs_frontend/coprs/exceptions.py
diff --git a/coprs_frontend/coprs/filters.py b/frontend/coprs_frontend/coprs/filters.py
similarity index 100%
rename from coprs_frontend/coprs/filters.py
rename to frontend/coprs_frontend/coprs/filters.py
diff --git a/coprs_frontend/coprs/forms.py b/frontend/coprs_frontend/coprs/forms.py
similarity index 100%
rename from coprs_frontend/coprs/forms.py
rename to frontend/coprs_frontend/coprs/forms.py
diff --git a/coprs_frontend/coprs/helpers.py b/frontend/coprs_frontend/coprs/helpers.py
similarity index 100%
rename from coprs_frontend/coprs/helpers.py
rename to frontend/coprs_frontend/coprs/helpers.py
diff --git a/coprs_frontend/coprs/log.py b/frontend/coprs_frontend/coprs/log.py
similarity index 100%
rename from coprs_frontend/coprs/log.py
rename to frontend/coprs_frontend/coprs/log.py
diff --git a/coprs_frontend/coprs/logic/__init__.py b/frontend/coprs_frontend/coprs/logic/__init__.py
similarity index 100%
rename from coprs_frontend/coprs/logic/__init__.py
rename to frontend/coprs_frontend/coprs/logic/__init__.py
diff --git a/coprs_frontend/coprs/logic/actions_logic.py b/frontend/coprs_frontend/coprs/logic/actions_logic.py
similarity index 100%
rename from coprs_frontend/coprs/logic/actions_logic.py
rename to frontend/coprs_frontend/coprs/logic/actions_logic.py
diff --git a/coprs_frontend/coprs/logic/builds_logic.py b/frontend/coprs_frontend/coprs/logic/builds_logic.py
similarity index 100%
rename from coprs_frontend/coprs/logic/builds_logic.py
rename to frontend/coprs_frontend/coprs/logic/builds_logic.py
diff --git a/coprs_frontend/coprs/logic/coprs_logic.py b/frontend/coprs_frontend/coprs/logic/coprs_logic.py
similarity index 100%
rename from coprs_frontend/coprs/logic/coprs_logic.py
rename to frontend/coprs_frontend/coprs/logic/coprs_logic.py
diff --git a/coprs_frontend/coprs/logic/users_logic.py b/frontend/coprs_frontend/coprs/logic/users_logic.py
similarity index 100%
rename from coprs_frontend/coprs/logic/users_logic.py
rename to frontend/coprs_frontend/coprs/logic/users_logic.py
diff --git a/coprs_frontend/coprs/models.py b/frontend/coprs_frontend/coprs/models.py
similarity index 100%
rename from coprs_frontend/coprs/models.py
rename to frontend/coprs_frontend/coprs/models.py
diff --git a/coprs_frontend/coprs/signals.py b/frontend/coprs_frontend/coprs/signals.py
similarity index 100%
rename from coprs_frontend/coprs/signals.py
rename to frontend/coprs_frontend/coprs/signals.py
diff --git a/coprs_frontend/coprs/static/README b/frontend/coprs_frontend/coprs/static/README
similarity index 100%
rename from coprs_frontend/coprs/static/README
rename to frontend/coprs_frontend/coprs/static/README
diff --git a/coprs_frontend/coprs/static/copr.css b/frontend/coprs_frontend/coprs/static/copr.css
similarity index 100%
rename from coprs_frontend/coprs/static/copr.css
rename to frontend/coprs_frontend/coprs/static/copr.css
diff --git a/coprs_frontend/coprs/static/copr.js b/frontend/coprs_frontend/coprs/static/copr.js
similarity index 100%
rename from coprs_frontend/coprs/static/copr.js
rename to frontend/coprs_frontend/coprs/static/copr.js
diff --git a/coprs_frontend/coprs/static/copr_logo.png b/frontend/coprs_frontend/coprs/static/copr_logo.png
similarity index 100%
rename from coprs_frontend/coprs/static/copr_logo.png
rename to frontend/coprs_frontend/coprs/static/copr_logo.png
diff --git a/coprs_frontend/coprs/static/default_user.png b/frontend/coprs_frontend/coprs/static/default_user.png
similarity index 100%
rename from coprs_frontend/coprs/static/default_user.png
rename to frontend/coprs_frontend/coprs/static/default_user.png
diff --git a/coprs_frontend/coprs/static/favicon.ico b/frontend/coprs_frontend/coprs/static/favicon.ico
similarity index 100%
rename from coprs_frontend/coprs/static/favicon.ico
rename to frontend/coprs_frontend/coprs/static/favicon.ico
diff --git a/coprs_frontend/coprs/static/header_background.png b/frontend/coprs_frontend/coprs/static/header_background.png
similarity index 100%
rename from coprs_frontend/coprs/static/header_background.png
rename to frontend/coprs_frontend/coprs/static/header_background.png
diff --git a/coprs_frontend/coprs/static/pink_arrow.png b/frontend/coprs_frontend/coprs/static/pink_arrow.png
similarity index 100%
rename from coprs_frontend/coprs/static/pink_arrow.png
rename to frontend/coprs_frontend/coprs/static/pink_arrow.png
diff --git a/coprs_frontend/coprs/templates/404.html b/frontend/coprs_frontend/coprs/templates/404.html
similarity index 100%
rename from coprs_frontend/coprs/templates/404.html
rename to frontend/coprs_frontend/coprs/templates/404.html
diff --git a/coprs_frontend/coprs/templates/_helpers.html b/frontend/coprs_frontend/coprs/templates/_helpers.html
similarity index 100%
rename from coprs_frontend/coprs/templates/_helpers.html
rename to frontend/coprs_frontend/coprs/templates/_helpers.html
diff --git a/coprs_frontend/coprs/templates/admin/index.html b/frontend/coprs_frontend/coprs/templates/admin/index.html
similarity index 100%
rename from coprs_frontend/coprs/templates/admin/index.html
rename to frontend/coprs_frontend/coprs/templates/admin/index.html
diff --git a/coprs_frontend/coprs/templates/admin/layout.html b/frontend/coprs_frontend/coprs/templates/admin/layout.html
similarity index 100%
rename from coprs_frontend/coprs/templates/admin/layout.html
rename to frontend/coprs_frontend/coprs/templates/admin/layout.html
diff --git a/coprs_frontend/coprs/templates/admin/legal-flag.html b/frontend/coprs_frontend/coprs/templates/admin/legal-flag.html
similarity index 100%
rename from coprs_frontend/coprs/templates/admin/legal-flag.html
rename to frontend/coprs_frontend/coprs/templates/admin/legal-flag.html
diff --git a/coprs_frontend/coprs/templates/api.html b/frontend/coprs_frontend/coprs/templates/api.html
similarity index 100%
rename from coprs_frontend/coprs/templates/api.html
rename to frontend/coprs_frontend/coprs/templates/api.html
diff --git a/coprs_frontend/coprs/templates/coprs/_coprs_forms.html b/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/_coprs_forms.html
rename to frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
diff --git a/coprs_frontend/coprs/templates/coprs/add.html b/frontend/coprs_frontend/coprs/templates/coprs/add.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/add.html
rename to frontend/coprs_frontend/coprs/templates/coprs/add.html
diff --git a/coprs_frontend/coprs/templates/coprs/copr.repo b/frontend/coprs_frontend/coprs/templates/coprs/copr.repo
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/copr.repo
rename to frontend/coprs_frontend/coprs/templates/coprs/copr.repo
diff --git a/coprs_frontend/coprs/templates/coprs/detail.html b/frontend/coprs_frontend/coprs/templates/coprs/detail.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/detail.html
rename to frontend/coprs_frontend/coprs/templates/coprs/detail.html
diff --git a/coprs_frontend/coprs/templates/coprs/detail/_builds_forms.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_forms.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/detail/_builds_forms.html
rename to frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_forms.html
diff --git a/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
rename to frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
diff --git a/coprs_frontend/coprs/templates/coprs/detail/_permissions_table.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/_permissions_table.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/detail/_permissions_table.html
rename to frontend/coprs_frontend/coprs/templates/coprs/detail/_permissions_table.html
diff --git a/coprs_frontend/coprs/templates/coprs/detail/add_build.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/add_build.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/detail/add_build.html
rename to frontend/coprs_frontend/coprs/templates/coprs/detail/add_build.html
diff --git a/coprs_frontend/coprs/templates/coprs/detail/builds.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/builds.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/detail/builds.html
rename to frontend/coprs_frontend/coprs/templates/coprs/detail/builds.html
diff --git a/coprs_frontend/coprs/templates/coprs/detail/delete.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/delete.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/detail/delete.html
rename to frontend/coprs_frontend/coprs/templates/coprs/detail/delete.html
diff --git a/coprs_frontend/coprs/templates/coprs/detail/edit.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/edit.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/detail/edit.html
rename to frontend/coprs_frontend/coprs/templates/coprs/detail/edit.html
diff --git a/coprs_frontend/coprs/templates/coprs/detail/edit2.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/edit2.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/detail/edit2.html
rename to frontend/coprs_frontend/coprs/templates/coprs/detail/edit2.html
diff --git a/coprs_frontend/coprs/templates/coprs/detail/edit_chroot.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/edit_chroot.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/detail/edit_chroot.html
rename to frontend/coprs_frontend/coprs/templates/coprs/detail/edit_chroot.html
diff --git a/coprs_frontend/coprs/templates/coprs/detail/monitor.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/monitor.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/detail/monitor.html
rename to frontend/coprs_frontend/coprs/templates/coprs/detail/monitor.html
diff --git a/coprs_frontend/coprs/templates/coprs/detail/overview.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/overview.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/detail/overview.html
rename to frontend/coprs_frontend/coprs/templates/coprs/detail/overview.html
diff --git a/coprs_frontend/coprs/templates/coprs/detail/permissions.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/permissions.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/detail/permissions.html
rename to frontend/coprs_frontend/coprs/templates/coprs/detail/permissions.html
diff --git a/coprs_frontend/coprs/templates/coprs/show.html b/frontend/coprs_frontend/coprs/templates/coprs/show.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/show.html
rename to frontend/coprs_frontend/coprs/templates/coprs/show.html
diff --git a/coprs_frontend/coprs/templates/layout.html b/frontend/coprs_frontend/coprs/templates/layout.html
similarity index 100%
rename from coprs_frontend/coprs/templates/layout.html
rename to frontend/coprs_frontend/coprs/templates/layout.html
diff --git a/coprs_frontend/coprs/templates/login.html b/frontend/coprs_frontend/coprs/templates/login.html
similarity index 100%
rename from coprs_frontend/coprs/templates/login.html
rename to frontend/coprs_frontend/coprs/templates/login.html
diff --git a/coprs_frontend/coprs/views/__init__.py b/frontend/coprs_frontend/coprs/views/__init__.py
similarity index 100%
rename from coprs_frontend/coprs/views/__init__.py
rename to frontend/coprs_frontend/coprs/views/__init__.py
diff --git a/coprs_frontend/coprs/views/admin_ns/__init__.py b/frontend/coprs_frontend/coprs/views/admin_ns/__init__.py
similarity index 100%
rename from coprs_frontend/coprs/views/admin_ns/__init__.py
rename to frontend/coprs_frontend/coprs/views/admin_ns/__init__.py
diff --git a/coprs_frontend/coprs/views/admin_ns/admin_general.py b/frontend/coprs_frontend/coprs/views/admin_ns/admin_general.py
similarity index 100%
rename from coprs_frontend/coprs/views/admin_ns/admin_general.py
rename to frontend/coprs_frontend/coprs/views/admin_ns/admin_general.py
diff --git a/coprs_frontend/coprs/views/api_ns/__init__.py b/frontend/coprs_frontend/coprs/views/api_ns/__init__.py
similarity index 100%
rename from coprs_frontend/coprs/views/api_ns/__init__.py
rename to frontend/coprs_frontend/coprs/views/api_ns/__init__.py
diff --git a/coprs_frontend/coprs/views/api_ns/api_general.py b/frontend/coprs_frontend/coprs/views/api_ns/api_general.py
similarity index 100%
rename from coprs_frontend/coprs/views/api_ns/api_general.py
rename to frontend/coprs_frontend/coprs/views/api_ns/api_general.py
diff --git a/coprs_frontend/coprs/views/backend_ns/__init__.py b/frontend/coprs_frontend/coprs/views/backend_ns/__init__.py
similarity index 100%
rename from coprs_frontend/coprs/views/backend_ns/__init__.py
rename to frontend/coprs_frontend/coprs/views/backend_ns/__init__.py
diff --git a/coprs_frontend/coprs/views/backend_ns/backend_general.py b/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py
similarity index 100%
rename from coprs_frontend/coprs/views/backend_ns/backend_general.py
rename to frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py
diff --git a/coprs_frontend/coprs/views/coprs_ns/__init__.py b/frontend/coprs_frontend/coprs/views/coprs_ns/__init__.py
similarity index 100%
rename from coprs_frontend/coprs/views/coprs_ns/__init__.py
rename to frontend/coprs_frontend/coprs/views/coprs_ns/__init__.py
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
similarity index 100%
rename from coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
rename to frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_chroots.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_chroots.py
similarity index 100%
rename from coprs_frontend/coprs/views/coprs_ns/coprs_chroots.py
rename to frontend/coprs_frontend/coprs/views/coprs_ns/coprs_chroots.py
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
similarity index 100%
rename from coprs_frontend/coprs/views/coprs_ns/coprs_general.py
rename to frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
diff --git a/coprs_frontend/coprs/views/misc.py b/frontend/coprs_frontend/coprs/views/misc.py
similarity index 100%
rename from coprs_frontend/coprs/views/misc.py
rename to frontend/coprs_frontend/coprs/views/misc.py
diff --git a/coprs_frontend/coprs/whoosheers.py b/frontend/coprs_frontend/coprs/whoosheers.py
similarity index 100%
rename from coprs_frontend/coprs/whoosheers.py
rename to frontend/coprs_frontend/coprs/whoosheers.py
diff --git a/coprs_frontend/manage.py b/frontend/coprs_frontend/manage.py
similarity index 100%
rename from coprs_frontend/manage.py
rename to frontend/coprs_frontend/manage.py
diff --git a/coprs_frontend/tests/__init__.py b/frontend/coprs_frontend/tests/__init__.py
similarity index 100%
rename from coprs_frontend/tests/__init__.py
rename to frontend/coprs_frontend/tests/__init__.py
diff --git a/coprs_frontend/tests/coprs_test_case.py b/frontend/coprs_frontend/tests/coprs_test_case.py
similarity index 100%
rename from coprs_frontend/tests/coprs_test_case.py
rename to frontend/coprs_frontend/tests/coprs_test_case.py
diff --git a/coprs_frontend/tests/test_helpers.py b/frontend/coprs_frontend/tests/test_helpers.py
similarity index 100%
rename from coprs_frontend/tests/test_helpers.py
rename to frontend/coprs_frontend/tests/test_helpers.py
diff --git a/coprs_frontend/tests/test_logic/test_builds_logic.py b/frontend/coprs_frontend/tests/test_logic/test_builds_logic.py
similarity index 100%
rename from coprs_frontend/tests/test_logic/test_builds_logic.py
rename to frontend/coprs_frontend/tests/test_logic/test_builds_logic.py
diff --git a/coprs_frontend/tests/test_logic/test_coprs_logic.py b/frontend/coprs_frontend/tests/test_logic/test_coprs_logic.py
similarity index 100%
rename from coprs_frontend/tests/test_logic/test_coprs_logic.py
rename to frontend/coprs_frontend/tests/test_logic/test_coprs_logic.py
diff --git a/coprs_frontend/tests/test_views/test_admin/test_admin_general.py b/frontend/coprs_frontend/tests/test_views/test_admin/test_admin_general.py
similarity index 100%
rename from coprs_frontend/tests/test_views/test_admin/test_admin_general.py
rename to frontend/coprs_frontend/tests/test_views/test_admin/test_admin_general.py
diff --git a/coprs_frontend/tests/test_views/test_backend_ns/test_backend_general.py b/frontend/coprs_frontend/tests/test_views/test_backend_ns/test_backend_general.py
similarity index 100%
rename from coprs_frontend/tests/test_views/test_backend_ns/test_backend_general.py
rename to frontend/coprs_frontend/tests/test_views/test_backend_ns/test_backend_general.py
diff --git a/coprs_frontend/tests/test_views/test_coprs_ns/__init__.py b/frontend/coprs_frontend/tests/test_views/test_coprs_ns/__init__.py
similarity index 100%
rename from coprs_frontend/tests/test_views/test_coprs_ns/__init__.py
rename to frontend/coprs_frontend/tests/test_views/test_coprs_ns/__init__.py
diff --git a/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_builds.py b/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_builds.py
similarity index 100%
rename from coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_builds.py
rename to frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_builds.py
diff --git a/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py b/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
similarity index 100%
rename from coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
rename to frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
diff --git a/backend/documentation/Makefile b/frontend/documentation/Makefile
similarity index 96%
copy from backend/documentation/Makefile
copy to frontend/documentation/Makefile
index 06216f0..1cfd8ec 100644
--- a/backend/documentation/Makefile
+++ b/frontend/documentation/Makefile
@@ -13,7 +13,7 @@ BUILD_DIR := build
EPYDOC_BIN := `which epydoc`
EPYDOC_SWITCHES := --inheritance listed --graph all --html
PYTHON_DOC_DIR := python-doc
-PYTHON_DIRS := ../
+PYTHON_DIRS := ../coprs_frontend
# TARGETS
# schema is not incldued here, since you need a live db
diff --git a/backend/documentation/how-to-generate-documentation.txt b/frontend/documentation/how-to-generate-documentation.txt
similarity index 100%
copy from backend/documentation/how-to-generate-documentation.txt
copy to frontend/documentation/how-to-generate-documentation.txt
10 years, 1 month
[copr] master: Automatic commit of package [copr-backend] release [1.29-1]. (d18fabe)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit d18fabe9b36aa2343c45feeaf5a443c01ede1831
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Mar 18 10:13:35 2014 +0100
Automatic commit of package [copr-backend] release [1.29-1].
>---------------------------------------------------------------
backend/copr-backend.spec | 5 ++++-
rel-eng/packages/copr-backend | 1 +
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/backend/copr-backend.spec b/backend/copr-backend.spec
index bb66b1a..2d96f8e 100644
--- a/backend/copr-backend.spec
+++ b/backend/copr-backend.spec
@@ -3,7 +3,7 @@
%endif
Name: copr-backend
-Version: 1.28
+Version: 1.29
Release: 1%{?dist}
Summary: Backend for Copr
@@ -168,6 +168,9 @@ useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr
%doc %{_pkgdocdir}/python-doc
%changelog
+* Tue Mar 18 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.29-1
+- move backend into separate package
+
* Thu Feb 27 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.28-1
- [backend] - pass lock to Actions
diff --git a/rel-eng/packages/copr-backend b/rel-eng/packages/copr-backend
new file mode 100644
index 0000000..d087bda
--- /dev/null
+++ b/rel-eng/packages/copr-backend
@@ -0,0 +1 @@
+1.29-1 backend/
10 years, 1 month
[copr] master: move backend in separate package (4b8204d)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 4b8204df4f01929d682f7fdd73f4c15478ef9fba
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Mar 18 10:01:14 2014 +0100
move backend in separate package
>---------------------------------------------------------------
.gitignore | 2 +-
LICENSE => backend/LICENSE | 0
backend/{ => backend}/__init__.py | 0
backend/{ => backend}/actions.py | 0
backend/{ => backend}/callback.py | 0
backend/{ => backend}/dispatcher.py | 0
backend/{ => backend}/errors.py | 0
backend/{ => backend}/mockremote.py | 0
.../copr-backend.service | 0
copr.spec => backend/copr-backend.spec | 267 +-------------------
.../copr-be.conf.example | 0
copr-be.py => backend/copr-be.py | 0
copr-prune-repo => backend/copr-prune-repo | 0
{crontab => backend/crontab}/copr-backend | 0
.../dist}/lighttpd/dirlisting.conf | 0
{backend-dist => backend/dist}/lighttpd/mime.conf | 0
{documentation => backend/documentation}/Makefile | 2 +-
.../how-to-generate-documentation.txt | 0
{logrotate => backend/logrotate}/copr-backend | 0
{playbooks => backend/playbooks}/builderpb.yml | 0
{playbooks => backend/playbooks}/terminatepb.yml | 0
.../tmpfiles.d}/copr-backend.conf | 0
copr.spec | 109 --------
23 files changed, 14 insertions(+), 366 deletions(-)
diff --git a/.gitignore b/.gitignore
index fa1a13a..1be2b2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
*.pyo
*.swp
data/
-dist/
+cli/dist/
build/
*.egg-info
documentation/build
diff --git a/LICENSE b/backend/LICENSE
similarity index 100%
copy from LICENSE
copy to backend/LICENSE
diff --git a/backend/__init__.py b/backend/backend/__init__.py
similarity index 100%
rename from backend/__init__.py
rename to backend/backend/__init__.py
diff --git a/backend/actions.py b/backend/backend/actions.py
similarity index 100%
rename from backend/actions.py
rename to backend/backend/actions.py
diff --git a/backend/callback.py b/backend/backend/callback.py
similarity index 100%
rename from backend/callback.py
rename to backend/backend/callback.py
diff --git a/backend/dispatcher.py b/backend/backend/dispatcher.py
similarity index 100%
rename from backend/dispatcher.py
rename to backend/backend/dispatcher.py
diff --git a/backend/errors.py b/backend/backend/errors.py
similarity index 100%
rename from backend/errors.py
rename to backend/backend/errors.py
diff --git a/backend/mockremote.py b/backend/backend/mockremote.py
similarity index 100%
rename from backend/mockremote.py
rename to backend/backend/mockremote.py
diff --git a/copr-backend.service b/backend/copr-backend.service
similarity index 100%
rename from copr-backend.service
rename to backend/copr-backend.service
diff --git a/copr.spec b/backend/copr-backend.spec
similarity index 73%
copy from copr.spec
copy to backend/copr-backend.spec
index 5c8a2f4..bb66b1a 100644
--- a/copr.spec
+++ b/backend/copr-backend.spec
@@ -1,27 +1,19 @@
-%global with_test 1
-%global with_server 1
%if 0%{?rhel} < 7 && 0%{?rhel} > 0
%global _pkgdocdir %{_docdir}/%{name}-%{version}
-%global __python2 %{__python}
-%global with_server 0
%endif
-%global moduletype apps
-%global modulename copr
-Name: copr
+Name: copr-backend
Version: 1.28
Release: 1%{?dist}
-Summary: Cool Other Package Repo
+Summary: Backend for Copr
Group: Applications/Productivity
License: GPLv2+
URL: https://fedorahosted.org/copr/
# Source is created by
# git clone https://git.fedorahosted.org/git/copr.git
-# cd copr
+# cd copr/backend
# tito build --tgz
-# content is same as https://git.fedorahosted.org/cgit/copr.git/snapshot/%{name}-%{version}-1....
-# but checksum does not match due different metadata
Source0: %{name}-%{version}.tar.gz
BuildArch: noarch
@@ -31,9 +23,7 @@ BuildRequires: util-linux
BuildRequires: python-setuptools
BuildRequires: python-requests
BuildRequires: python2-devel
-%if %{with_server}
BuildRequires: systemd
-%endif
%if 0%{?rhel} < 7 && 0%{?rhel} > 0
BuildRequires: python-argparse
%endif
@@ -41,19 +31,7 @@ BuildRequires: python-argparse
BuildRequires: epydoc
BuildRequires: graphviz
BuildRequires: make
-%if %{with_server}
-#for selinux
-BuildRequires: checkpolicy, selinux-policy-devel
-BuildRequires: policycoreutils >= %{POLICYCOREUTILSVER}
-%endif
-%description
-COPR is lightweight build system. It allows you to create new project in WebUI,
-and submit new builds and COPR will create yum repository from latest builds.
-
-%if %{with_server}
-%package backend
-Summary: Backend for COPR
Requires: ansible >= 1.2
Requires: lighttpd
Requires: euca2ools
@@ -75,80 +53,14 @@ Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
-%description backend
+%description
COPR is lightweight build system. It allows you to create new project in WebUI,
and submit new builds and COPR will create yum repository from latest builds.
This package contains backend.
-%package frontend
-Summary: Frontend for COPR
-Requires: httpd
-Requires: mod_wsgi
-Requires: python-alembic
-Requires: python-flask
-Requires: python-flask-openid
-Requires: python-flask-wtf
-Requires: python-flask-sqlalchemy
-Requires: python-flask-script
-Requires: python-flask-whooshee
-#Requires: python-virtualenv
-Requires: python-blinker
-Requires: python-markdown
-Requires: python-psycopg2
-Requires: python-pylibravatar
-Requires: python-whoosh >= 2.5.3
-Requires: pytz
-# for tests:
-Requires: pytest
-Requires: python-flexmock
-Requires: python-decorator
-Requires: yum
-%if 0%{?rhel} < 7 && 0%{?rhel} > 0
-BuildRequires: python-argparse
-%endif
-# check
-BuildRequires: python-flask
-BuildRequires: python-flask-script
-BuildRequires: python-flask-sqlalchemy
-BuildRequires: python-flask-openid
-BuildRequires: python-flask-whooshee
-BuildRequires: python-pylibravatar
-BuildRequires: python-flask-wtf
-BuildRequires: pytest
-BuildRequires: yum
-BuildRequires: python-flexmock
-BuildRequires: python-decorator
-BuildRequires: python-markdown
-BuildRequires: pytz
-
-%description frontend
-COPR is lightweight build system. It allows you to create new project in WebUI,
-and submit new builds and COPR will create yum repository from latests builds.
-
-This package contains frontend.
-%endif # with_server
-
-%package cli
-Summary: Command line interface for COPR
-Requires: python-requests
-Requires: python-setuptools
-%if 0%{?rhel} < 6 && 0%{?rhel} > 0
-Group: Applications/Productivity
-%endif
-%if 0%{?rhel} < 7 && 0%{?rhel} > 0
-Requires: python-argparse
-%endif
-
-%description cli
-COPR is lightweight build system. It allows you to create new project in WebUI,
-and submit new builds and COPR will create yum repository from latests builds.
-
-This package contains command line interface.
-
-%if %{with_server}
%package doc
-Summary: Code documentation for COPR
+Summary: Code documentation for COPR backend
%description doc
COPR is lightweight build system. It allows you to create new project in WebUI,
@@ -157,54 +69,18 @@ and submit new builds and COPR will create yum repository from latests builds.
This package include documentation for COPR code. Mostly useful for developers
only.
-%package selinux
-Summary: SELinux module for COPR
-Requires(post): policycoreutils, libselinux-utils
-Requires(post): policycoreutils-python
-Requires(post): selinux-policy-targeted
-Requires(postun): policycoreutils
-
-%description selinux
-COPR is lightweight build system. It allows you to create new project in WebUI,
-and submit new builds and COPR will create yum repository from latests builds.
-
-This package include SELinux targeted module for COPR
-%endif
-
%prep
%setup -q
%build
-mv copr_cli/README.rst ./
-
-# convert manages
-a2x -d manpage -f manpage man/copr-cli.1.asciidoc
-a2x -d manpage -f manpage man/copr-selinux-enable.8.asciidoc
-a2x -d manpage -f manpage man/copr-selinux-relabel.8.asciidoc
-
# build documentation
pushd documentation
make %{?_smp_mflags} python
popd
-%if %{with_server}
-#selinux
-pushd selinux
-perl -i -pe 'BEGIN { $VER = join ".", grep /^\d+$/, split /\./, "%{version}.%{release}"; } s!\@\@VERSION\@\@!$VER!g;' %{modulename}.te
-for selinuxvariant in targeted; do
- make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
- bzip2 -9 %{modulename}.pp
- mv %{modulename}.pp.bz2 %{modulename}.pp.bz2.${selinuxvariant}
- make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
-done
-popd
-%endif
-
%install
-%if %{with_server}
-#backend
install -d %{buildroot}%{_sharedstatedir}/copr
install -d %{buildroot}%{_sharedstatedir}/copr/jobs
install -d %{buildroot}%{_sharedstatedir}/copr/public_html/results
@@ -227,7 +103,7 @@ cp -a copr-be.conf.example %{buildroot}%{_sysconfdir}/copr/copr-be.conf
install -p -m 755 copr-prune-repo %{buildroot}%{_sbindir}/copr-prune-repo
install -p -m 750 crontab/copr-backend %{buildroot}%{_sysconfdir}/cron.daily/copr-backend
-cp -a backend-dist/lighttpd/* %{buildroot}%{_pkgdocdir}/lighttpd/
+cp -a dist/lighttpd/* %{buildroot}%{_pkgdocdir}/lighttpd/
cp -a logrotate/* %{buildroot}%{_sysconfdir}/logrotate.d/
cp -a tmpfiles.d/* %{buildroot}/%{_tmpfilesdir}
@@ -240,108 +116,27 @@ touch %{buildroot}%{_var}/run/copr-backend/copr-be.pid
install -m 0644 copr-backend.service %{buildroot}/%{_unitdir}/
-#frontend
-install -d %{buildroot}%{_sysconfdir}
-install -d %{buildroot}%{_datadir}/copr/coprs_frontend
-install -d %{buildroot}%{_sharedstatedir}/copr/data/openid_store
-install -d %{buildroot}%{_sharedstatedir}/copr/data/openid_store/associations
-install -d %{buildroot}%{_sharedstatedir}/copr/data/openid_store/nonces
-install -d %{buildroot}%{_sharedstatedir}/copr/data/openid_store/temp
-install -d %{buildroot}%{_sharedstatedir}/copr/data/whooshee
-install -d %{buildroot}%{_sharedstatedir}/copr/data/whooshee/copr_user_whoosheer
-
-cp -a coprs_frontend/* %{buildroot}%{_datadir}/copr/coprs_frontend
-mv %{buildroot}%{_datadir}/copr/coprs_frontend/coprs.conf.example ./
-mv %{buildroot}%{_datadir}/copr/coprs_frontend/config/* %{buildroot}%{_sysconfdir}/copr
-rm %{buildroot}%{_datadir}/copr/coprs_frontend/CONTRIBUTION_GUIDELINES
-touch %{buildroot}%{_sharedstatedir}/copr/data/copr.db
-%endif # with_server
-
-#copr-cli
-%{__python2} coprcli-setup.py install --root %{buildroot}
-install -d %{buildroot}%{_mandir}/man1
-install -p -m 644 man/copr-cli.1 %{buildroot}/%{_mandir}/man1/
-
-%if %{with_server}
#doc
cp -a documentation/python-doc %{buildroot}%{_pkgdocdir}/
cp -a playbooks %{buildroot}%{_pkgdocdir}/
-#selinux
-for selinuxvariant in targeted; do
- install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
- install -p -m 644 selinux/%{modulename}.pp.bz2.${selinuxvariant} \
- %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp.bz2
-done
-# Install SELinux interfaces
-install -d %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}
-install -p -m 644 selinux/%{modulename}.if \
- %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if
-# Install copr-selinux-enable which will be called in %posttrans
-install -d %{buildroot}%{_sbindir}
-install -p -m 755 selinux/%{name}-selinux-enable %{buildroot}%{_sbindir}/%{name}-selinux-enable
-install -p -m 755 selinux/%{name}-selinux-relabel %{buildroot}%{_sbindir}/%{name}-selinux-relabel
-
-install -d %{buildroot}%{_mandir}/man8
-install -p -m 644 man/%{name}-selinux-enable.8 %{buildroot}/%{_mandir}/man8/
-install -p -m 644 man/%{name}-selinux-relabel.8 %{buildroot}/%{_mandir}/man8/
-%endif
-
-%check
-%if %{with_test} && %{with_server} && %{_arch} == "x86_64"
- pushd coprs_frontend
- rm -rf /tmp/copr.db /tmp/whooshee || :
- COPR_CONFIG="$(pwd)/config/copr_unit_test.conf" ./manage.py test
- popd
-%endif
-
-%if %{with_server}
-%pre backend
+%pre
getent group copr >/dev/null || groupadd -r copr
getent passwd copr >/dev/null || \
useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr
/usr/bin/passwd -l copr >/dev/null
-%post backend
+%post
%systemd_post copr-backend.service
-%preun backend
+%preun
%systemd_preun copr-backend.service
-%postun backend
+%postun
%systemd_postun_with_restart copr-backend.service
-%pre frontend
-getent group copr-fe >/dev/null || groupadd -r copr-fe
-getent passwd copr-fe >/dev/null || \
-useradd -r -g copr-fe -G copr-fe -d %{_datadir}/copr/coprs_frontend -s /bin/bash -c "COPR frontend user" copr-fe
-/usr/bin/passwd -l copr-fe >/dev/null
-
-%post frontend
-service httpd condrestart
-
-%post selinux
-if /usr/sbin/selinuxenabled ; then
- %{_sbindir}/%{name}-selinux-enable
-fi
-
-%posttrans selinux
-if /usr/sbin/selinuxenabled ; then
- %{_sbindir}/%{name}-selinux-relabel
-fi
-
-%postun
-# Clean up after package removal
-if [ $1 -eq 0 ]; then
- for selinuxvariant in targeted; do
- /usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \
- && /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} || :
- done
-fi
-%{sbinpath}/restorecon -rvvi %{_sharedstatedir}/copr
-
-%files backend
-%doc LICENSE README
+%files
+%doc LICENSE
%dir %{_datadir}/copr
%dir %{_sharedstatedir}/copr
%dir %attr(0755, copr, copr) %{_sharedstatedir}/copr/jobs/
@@ -369,47 +164,9 @@ fi
%{_datadir}/copr/backend
%{_datadir}/copr/copr-be.py*
-%files frontend
-%doc LICENSE coprs.conf.example copr-setup.txt
-%dir %{_datadir}/copr
-%dir %{_sysconfdir}/copr
-%dir %{_sharedstatedir}/copr
-%{_datadir}/copr/coprs_frontend
-
-%defattr(-, copr-fe, copr-fe, -)
-%dir %{_sharedstatedir}/copr/data
-%dir %{_sharedstatedir}/copr/data/openid_store
-%dir %{_sharedstatedir}/copr/data/whooshee
-%dir %{_sharedstatedir}/copr/data/whooshee/copr_user_whoosheer
-
-%ghost %{_sharedstatedir}/copr/data/copr.db
-
-%defattr(600, copr-fe, copr-fe, 700)
-%config(noreplace) %{_sysconfdir}/copr/copr.conf
-%config(noreplace) %{_sysconfdir}/copr/copr_devel.conf
-%config(noreplace) %{_sysconfdir}/copr/copr_unit_test.conf
-%endif # with_server
-
-%files cli
-%doc LICENSE README.rst
-%{_bindir}/copr-cli
-%{python_sitelib}/*
-%{_mandir}/man1/copr-cli.1*
-
-%if %{with_server}
%files doc
%doc %{_pkgdocdir}/python-doc
-%files selinux
-%{_datadir}/selinux/*/%{modulename}.pp.bz2
-# empty, do not distribute it for now
-%exclude %{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if
-%{_sbindir}/%{name}-selinux-enable
-%{_sbindir}/%{name}-selinux-relabel
-%{_mandir}/man8/%{name}-selinux-enable.8*
-%{_mandir}/man8/%{name}-selinux-relabel.8*
-%endif # with_server
-
%changelog
* Thu Feb 27 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.28-1
- [backend] - pass lock to Actions
diff --git a/copr-be.conf.example b/backend/copr-be.conf.example
similarity index 100%
rename from copr-be.conf.example
rename to backend/copr-be.conf.example
diff --git a/copr-be.py b/backend/copr-be.py
similarity index 100%
rename from copr-be.py
rename to backend/copr-be.py
diff --git a/copr-prune-repo b/backend/copr-prune-repo
similarity index 100%
rename from copr-prune-repo
rename to backend/copr-prune-repo
diff --git a/crontab/copr-backend b/backend/crontab/copr-backend
similarity index 100%
rename from crontab/copr-backend
rename to backend/crontab/copr-backend
diff --git a/backend-dist/lighttpd/dirlisting.conf b/backend/dist/lighttpd/dirlisting.conf
similarity index 100%
rename from backend-dist/lighttpd/dirlisting.conf
rename to backend/dist/lighttpd/dirlisting.conf
diff --git a/backend-dist/lighttpd/mime.conf b/backend/dist/lighttpd/mime.conf
similarity index 100%
rename from backend-dist/lighttpd/mime.conf
rename to backend/dist/lighttpd/mime.conf
diff --git a/documentation/Makefile b/backend/documentation/Makefile
similarity index 94%
copy from documentation/Makefile
copy to backend/documentation/Makefile
index fe284a6..06216f0 100644
--- a/documentation/Makefile
+++ b/backend/documentation/Makefile
@@ -13,7 +13,7 @@ BUILD_DIR := build
EPYDOC_BIN := `which epydoc`
EPYDOC_SWITCHES := --inheritance listed --graph all --html
PYTHON_DOC_DIR := python-doc
-PYTHON_DIRS := ../backend ../copr_cli ../coprs_frontend
+PYTHON_DIRS := ../
# TARGETS
# schema is not incldued here, since you need a live db
diff --git a/documentation/how-to-generate-documentation.txt b/backend/documentation/how-to-generate-documentation.txt
similarity index 100%
copy from documentation/how-to-generate-documentation.txt
copy to backend/documentation/how-to-generate-documentation.txt
diff --git a/logrotate/copr-backend b/backend/logrotate/copr-backend
similarity index 100%
rename from logrotate/copr-backend
rename to backend/logrotate/copr-backend
diff --git a/playbooks/builderpb.yml b/backend/playbooks/builderpb.yml
similarity index 100%
rename from playbooks/builderpb.yml
rename to backend/playbooks/builderpb.yml
diff --git a/playbooks/terminatepb.yml b/backend/playbooks/terminatepb.yml
similarity index 100%
rename from playbooks/terminatepb.yml
rename to backend/playbooks/terminatepb.yml
diff --git a/tmpfiles.d/copr-backend.conf b/backend/tmpfiles.d/copr-backend.conf
similarity index 100%
rename from tmpfiles.d/copr-backend.conf
rename to backend/tmpfiles.d/copr-backend.conf
diff --git a/copr.spec b/copr.spec
index 5c8a2f4..c6afb14 100644
--- a/copr.spec
+++ b/copr.spec
@@ -52,35 +52,6 @@ COPR is lightweight build system. It allows you to create new project in WebUI,
and submit new builds and COPR will create yum repository from latest builds.
%if %{with_server}
-%package backend
-Summary: Backend for COPR
-Requires: ansible >= 1.2
-Requires: lighttpd
-Requires: euca2ools
-Requires: rsync
-Requires: openssh-clients
-Requires: mock
-Requires: yum-utils
-Requires: createrepo_c >= 0.2.1-3
-Requires: python-bunch
-Requires: python-daemon
-Requires: python-lockfile
-Requires: python-requests
-Requires: python-setproctitle
-Requires: logrotate
-Requires: fedmsg
-Requires: gawk
-Requires: crontabs
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
-
-%description backend
-COPR is lightweight build system. It allows you to create new project in WebUI,
-and submit new builds and COPR will create yum repository from latest builds.
-
-This package contains backend.
-
%package frontend
Summary: Frontend for COPR
Requires: httpd
@@ -204,42 +175,6 @@ popd
%install
%if %{with_server}
-#backend
-install -d %{buildroot}%{_sharedstatedir}/copr
-install -d %{buildroot}%{_sharedstatedir}/copr/jobs
-install -d %{buildroot}%{_sharedstatedir}/copr/public_html/results
-install -d %{buildroot}%{_var}/log/copr
-install -d %{buildroot}%{_var}/log/copr/workers/
-install -d %{buildroot}%{_pkgdocdir}/lighttpd/
-install -d %{buildroot}%{_datadir}/copr/backend
-install -d %{buildroot}%{_sysconfdir}/copr
-install -d %{buildroot}%{_sysconfdir}/logrotate.d/
-install -d %{buildroot}%{_unitdir}
-install -d %{buildroot}/%{_var}/log/copr-backend
-install -d %{buildroot}/%{_var}/run/copr-backend/
-install -d %{buildroot}/%{_tmpfilesdir}
-install -d %{buildroot}/%{_sbindir}
-install -d %{buildroot}%{_sysconfdir}/cron.daily
-
-cp -a backend/* %{buildroot}%{_datadir}/copr/backend
-cp -a copr-be.py %{buildroot}%{_datadir}/copr/
-cp -a copr-be.conf.example %{buildroot}%{_sysconfdir}/copr/copr-be.conf
-install -p -m 755 copr-prune-repo %{buildroot}%{_sbindir}/copr-prune-repo
-install -p -m 750 crontab/copr-backend %{buildroot}%{_sysconfdir}/cron.daily/copr-backend
-
-cp -a backend-dist/lighttpd/* %{buildroot}%{_pkgdocdir}/lighttpd/
-cp -a logrotate/* %{buildroot}%{_sysconfdir}/logrotate.d/
-cp -a tmpfiles.d/* %{buildroot}/%{_tmpfilesdir}
-
-# for ghost files
-touch %{buildroot}%{_var}/log/copr/copr.log
-for i in `seq 7`; do
- touch %{buildroot}%{_var}/log/copr/workers/worker-$i.log
-done
-touch %{buildroot}%{_var}/run/copr-backend/copr-be.pid
-
-install -m 0644 copr-backend.service %{buildroot}/%{_unitdir}/
-
#frontend
install -d %{buildroot}%{_sysconfdir}
install -d %{buildroot}%{_datadir}/copr/coprs_frontend
@@ -296,21 +231,6 @@ install -p -m 644 man/%{name}-selinux-relabel.8 %{buildroot}/%{_mandir}/man8/
%endif
%if %{with_server}
-%pre backend
-getent group copr >/dev/null || groupadd -r copr
-getent passwd copr >/dev/null || \
-useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr
-/usr/bin/passwd -l copr >/dev/null
-
-%post backend
-%systemd_post copr-backend.service
-
-%preun backend
-%systemd_preun copr-backend.service
-
-%postun backend
-%systemd_postun_with_restart copr-backend.service
-
%pre frontend
getent group copr-fe >/dev/null || groupadd -r copr-fe
getent passwd copr-fe >/dev/null || \
@@ -340,35 +260,6 @@ if [ $1 -eq 0 ]; then
fi
%{sbinpath}/restorecon -rvvi %{_sharedstatedir}/copr
-%files backend
-%doc LICENSE README
-%dir %{_datadir}/copr
-%dir %{_sharedstatedir}/copr
-%dir %attr(0755, copr, copr) %{_sharedstatedir}/copr/jobs/
-%dir %attr(0755, copr, copr) %{_sharedstatedir}/copr/public_html/
-%dir %attr(0755, copr, copr) %{_sharedstatedir}/copr/public_html/results
-%dir %attr(0755, copr, copr) %{_var}/log/copr
-%dir %attr(0755, copr, copr) %{_var}/log/copr/workers
-%dir %attr(0755, copr, copr) %{_var}/run/copr-backend
-
-%ghost %{_var}/log/copr/copr.log
-%ghost %{_var}/log/copr/workers/worker-*.log
-%ghost %{_var}/run/copr-backend/copr-be.pid
-
-%config(noreplace) %{_sysconfdir}/logrotate.d/copr-backend
-%dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/lighttpd
-%doc %{_pkgdocdir}/playbooks
-%dir %{_sysconfdir}/copr
-%config(noreplace) %attr(0640, root, copr) %{_sysconfdir}/copr/copr-be.conf
-%{_unitdir}/copr-backend.service
-%{_tmpfilesdir}/copr-backend.conf
-%{_sbindir}/copr-prune-repo
-%config(noreplace) %{_sysconfdir}/cron.daily/copr-backend
-
-%{_datadir}/copr/backend
-%{_datadir}/copr/copr-be.py*
-
%files frontend
%doc LICENSE coprs.conf.example copr-setup.txt
%dir %{_datadir}/copr
10 years, 1 month
[copr] master: improve wording and minor formatting issues (814a316)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 814a316c9a995dce7d7b6305e51bee4e05c63120
Author: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Mon Mar 17 10:54:29 2014 +1000
improve wording and minor formatting issues
>---------------------------------------------------------------
man/copr-cli.1.asciidoc | 46 ++++++++++++++++++++--------------
man/copr-selinux-enable.8.asciidoc | 6 ++--
man/copr-selinux-relabel.8.asciidoc | 7 +++--
3 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/man/copr-cli.1.asciidoc b/man/copr-cli.1.asciidoc
index 295efba..b556cef 100644
--- a/man/copr-cli.1.asciidoc
+++ b/man/copr-cli.1.asciidoc
@@ -5,7 +5,7 @@ copr-cli(1)
NAME
----
-copr-cli - command line interface for COPR
+copr-cli - command line interface for Copr
SYNOPSIS
@@ -15,8 +15,9 @@ copr-cli [-h] [--version] {list,create,build} ...
DESCRIPTION
-----------
-This command allow you to interact with build system COPR from command line.
-You need to generate and provide API key (see API KEY section below)
+This command allows you to interact with the Copr build system from the command line.
+
+You need to generate an API key first (see the API KEY section below).
OPTIONS
-------
@@ -25,23 +26,23 @@ OPTIONS
show this help message and exit
--version::
-show program's version number and exit
+show the program's version number and exit
ACTIONS
-------
list [username]::
-List all the copr of the provided username. If no username is provided,
-then your coprs are listed.
+List all the coprs of the provided username. If no username is provided,
+then your copr repositories are listed.
create::
Create a new copr.
build ::
-Build packages to a specified copr.
+Build packages for a specified copr.
status::
-Get status of the build.
+Get the status of the build.
`copr-cli create [options]`
@@ -85,38 +86,45 @@ Override timeout for this build
Don't wait for build completion
copr::
-The copr repo to build the package in. This can be simple name of some of your projects. Or
-you can specify it as username/project. This way you can build into project of somebody else
-if you are allowed to.
+The copr repo to build the package in. This can be a simple name of some of
+your projects. Alternatively, you can specify it as username/project. This
+way you can build into the project of another user provided you have the
+permissions to do so.
pkg_url::
-URL of package to build. Package must be placed on some public web of ftp, from where it can
-be downloaded.
+URL of the package to build. The package must be placed on a public web or
+ftp server.
API KEY
-------
-Visit page http://your.copr/api and note down API token.
-
-Open file `~/.config/copr` and put there content:
+Visit the page https://copr.fedoraproject.org/api/ to obtain an API token.
+This token must be saved in the file `~/.config/copr` in the following
+format:
[copr-cli]
username = msuchy
login = Y57wcg==##fkfaxbkjhuoiebfafadl
token = vbfseelqdebzedukgombekmuvbkqwo
-Be aware that API token have some expiration. See Expiration date on /api page.
+Be aware that API tokens have an expiration date. The expiration date for
+your token is listed on the /api page.
+
+If you are using a different instance for the Copr service, the API token is
+available from http://your.copr.server/api/
COPR URL
--------
-You can alternatively specify different URL of Copr service. Open file `~/.config/copr` and put there:
+You can alternatively specify a different URL for the Copr service.
+Open the file `~/.config/copr` provide the `copr_url` setting:
[copr-cli]
copr_url = https://copr.fedoraproject.org
-The value above is default. Define copr_url only if you use different instance.
+The value listed above is the default value. Only define copr_url only if
+you use a different instance.
AUTHORS
-------
diff --git a/man/copr-selinux-enable.8.asciidoc b/man/copr-selinux-enable.8.asciidoc
index 4c55023..63a57ae 100644
--- a/man/copr-selinux-enable.8.asciidoc
+++ b/man/copr-selinux-enable.8.asciidoc
@@ -16,10 +16,10 @@ copr-selinux-enable
DESCRIPTION
-----------
-The *copr-selinux-enable* program will install and enable Copr
-SELinux module and sets required SELinux bool flags.
+The *copr-selinux-enable* program will install and enable the Copr
+SELinux module and set the required SELinux flags.
-The program is called by rpm post script and it
+The program is called by an rpm post script and it
is not usually required to run it manually.
SEE ALSO
diff --git a/man/copr-selinux-relabel.8.asciidoc b/man/copr-selinux-relabel.8.asciidoc
index c2b6339..59bbab8 100644
--- a/man/copr-selinux-relabel.8.asciidoc
+++ b/man/copr-selinux-relabel.8.asciidoc
@@ -17,11 +17,12 @@ DESCRIPTION
-----------
The *copr-selinux-relabel* program will call restorecon(8) on all
-Copr files. Efectively restore SELinux context.
+Copr files. This effectively restores the SELinux context.
-The program is called by rpm post script and it
+The program is called by an rpm post script and it
is not usually required to run it manually.
-=head1 SEE ALSO
+SEE ALSO
+--------
copr-selinux-enable(8), restorecon(8)
10 years, 1 month