diff --git a/configs/dist-git/dist-git.conf b/configs/dist-git/dist-git.conf deleted file mode 100644 index ef5275b..0000000 --- a/configs/dist-git/dist-git.conf +++ /dev/null @@ -1,64 +0,0 @@ -# What to do AFTER changing this config: -# 1. /etc/gitolite/admins <- usernames of gitolite admins -# 2. /etc/cron.d/dist-git/dist_git_sync.cron <- enable auto-sync -# /cgit_pkg_list.cron <- enable cgit auto-sync - - -[acls] - -# user groups on the server associated with dist-git -# example: -# user_groups=cvsadmin,fedora-arm,fedora-sparc,fedora-ia64,fedora-s390,fedora-ppc,provenpackager -user_groups=cvsadmin - -# user groups with write access to all repositories -# example: -# admin_groups=cvsadmin,fedora-arm,fedora-s390,fedora-ppc -admin_groups=cvsadmin - -# comma separated list of active branches to create ACLs for -# example: -# active_branches=olpc2,olpc3,el4,el5,el6,el7,epel7,f11,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f22,master -active_branches= - -# a "regex"ish list of the reserved branches -# example: -# reserved_branches=f[0-9][0-9],epel[0-9],epel[0-9][0-9],el[0-9],olpc[0-9] -reserved_branches=f[0-9][0-9],epel[0-9],epel[0-9][0-9],el[0-9],olpc[0-9] - -# url of package database - acls (data in json format) -# You can leave it empty if you don't want to use it. -# example: -# pkgdb_acls_url=https://admin.fedoraproject.org/pkgdb/api/vcs?format=json -pkgdb_acls_url= - -# url of package database - groups (data in json format) -# You can leave it empty if you don't want to use it. -# example: -# pkgdb_groups_url=https://admin.fedoraproject.org/pkgdb/api/groups?format=json -pkgdb_groups_url= - - - -[notifications] - -# email notifications: -# example: -# email_domain=fedoraproject.org -email_domain=example.com - -# List of email adresses to be notified about changes -# $PACKAGE can be used as a package name -# example: -# pkg_owner_emails=$PACKAGE-owner@fedoraproject.org,scm-commits@lists.fedoraproject.org -pkg_owner_emails=$PACKAGE-nobody@example.com - - - -[git] - -# the default author of git branches -# example: -# default_branch_author=Fedora Release Engineering -default_branch_author=Jerry Random - diff --git a/dist-git.spec b/dist-git.spec index e66be0d..03a2d45 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -105,9 +105,8 @@ install -d %{buildroot}%{_sysconfdir}/dist-git install -d %{buildroot}%{_sysconfdir}/httpd/conf.d/dist-git mkdir -p %{buildroot}%{_unitdir} -cp -a configs/dist-git/dist-git.conf %{buildroot}%{_sysconfdir}/dist-git/ -cp -a configs/httpd/dist-git.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/ cp -a configs/httpd/ssl.conf.example %{buildroot}%{_sysconfdir}/httpd/conf.d/ +cp -a configs/httpd/dist-git.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/ cp -a configs/httpd/dist-git/* %{buildroot}%{_sysconfdir}/httpd/conf.d/dist-git/ cp -a configs/systemd/* %{buildroot}%{_unitdir}/ @@ -170,11 +169,10 @@ fi # /etc/ .......... config files # ------------------------------------------------------------------------------ %dir %{_sysconfdir}/dist-git -%config(noreplace) %{_sysconfdir}/dist-git/dist-git.conf -%config(noreplace) %{_sysconfdir}/httpd/conf.d/dist-git.conf %config %{_sysconfdir}/httpd/conf.d/ssl.conf.example %dir %{_sysconfdir}/httpd/conf.d/dist-git %config(noreplace) %{_sysconfdir}/httpd/conf.d/dist-git/* +%config(noreplace) %{_sysconfdir}/httpd/conf.d/dist-git.conf %{_unitdir}/dist-git@.service %{_unitdir}/dist-git.socket