diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 85013db..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/swift-2.3.0rc2.tar.gz -/swift-2.3.0.tar.gz -/swift-2.4.0.tar.gz -/swift-2.5.0.tar.gz diff --git a/0001-remove-runtime-requirement-on-pbr.patch b/0001-remove-runtime-requirement-on-pbr.patch deleted file mode 100644 index 7785766..0000000 --- a/0001-remove-runtime-requirement-on-pbr.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8ac9e78933363d8213c256d204d71646a30bfb2f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?P=C3=A1draig=20Brady?= -Date: Wed, 9 Oct 2013 12:38:40 +0100 -Subject: [PATCH] remove runtime requirement on pbr - ---- - swift/__init__.py | 18 ++---------------- - 1 file changed, 2 insertions(+), 16 deletions(-) - -diff --git a/swift/__init__.py b/swift/__init__.py -index 9d0e889..d7a4012 100644 ---- a/swift/__init__.py -+++ b/swift/__init__.py -@@ -16,22 +16,8 @@ - import os - import gettext - --import pkg_resources -- --try: -- # First, try to get our version out of PKG-INFO. If we're installed, -- # this'll let us find our version without pulling in pbr. After all, if -- # we're installed on a system, we're not in a Git-managed source tree, so -- # pbr doesn't really buy us anything. -- __version__ = __canonical_version__ = pkg_resources.get_provider( -- pkg_resources.Requirement.parse('swift')).version --except pkg_resources.DistributionNotFound: -- # No PKG-INFO? We're probably running from a checkout, then. Let pbr do -- # its thing to figure out a version number. -- import pbr.version -- _version_info = pbr.version.VersionInfo('swift') -- __version__ = _version_info.release_string() -- __canonical_version__ = _version_info.version_string() -+__version__ = "%RPMVERSION%-%RPMRELEASE%" -+__canonical_version__ = "%RPMVERSION%" - - _localedir = os.environ.get('SWIFT_LOCALEDIR') - _t = gettext.translation('swift', localedir=_localedir, fallback=True) diff --git a/0002-Add-fixes-for-building-the-doc-package.patch b/0002-Add-fixes-for-building-the-doc-package.patch deleted file mode 100644 index 151b21f..0000000 --- a/0002-Add-fixes-for-building-the-doc-package.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0bab29e45f13cbb9a6348f4da3c2d4d0fdf5397c Mon Sep 17 00:00:00 2001 -From: Alan Pevec -Date: Thu, 5 Jan 2012 00:03:00 +0100 -Subject: [PATCH] Add fixes for building the doc package -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- always reference the swift module from the package we're building -- use oslo.sphinx from python-oslo-sphinx 1.x -Based on Nova/Glance EPEL patch by Pádraig Brady ---- - doc/source/conf.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/doc/source/conf.py b/doc/source/conf.py -index 5d2fbd3..3fa01c3 100644 ---- a/doc/source/conf.py -+++ b/doc/source/conf.py -@@ -20,8 +20,8 @@ import datetime - # If extensions (or modules to document with autodoc) are in another directory, - # add these directories to sys.path here. If the directory is relative to the - # documentation root, use os.path.abspath to make it absolute, like shown here. --sys.path.extend([os.path.abspath('../swift'), os.path.abspath('..'), -- os.path.abspath('../bin')]) -+sys.path.extend([os.path.abspath('../../swift'), os.path.abspath('../..'), -+ os.path.abspath('../../bin')]) - - # -- General configuration ---------------------------------------------------- - -@@ -29,7 +29,7 @@ sys.path.extend([os.path.abspath('../swift'), os.path.abspath('..'), - # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. - extensions = ['sphinx.ext.autodoc', - 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', -- 'sphinx.ext.ifconfig', 'oslosphinx'] -+ 'sphinx.ext.ifconfig', 'oslo.sphinx'] - todo_include_todos = True - - # Add any paths that contain templates here, relative to this directory. diff --git a/ChangeLog.old b/ChangeLog.old deleted file mode 100644 index a254681..0000000 --- a/ChangeLog.old +++ /dev/null @@ -1,199 +0,0 @@ -* Wed Jan 28 2015 Pete Zaitcev 2.2.0-4 -- Update parameters to authtoken in proxy-server.conf, upstream review 150832 -- Add mandatory middleware to pipeline of proxy (#1051113, #1181126) - -* Wed Jan 14 2015 Pete Zaitcev 2.2.0-3 -- Intercept logging to local[012].* because Packstack uses LOCAL1 too (#997983) -- Move the /var/run conf from /etc/tmpfiles.d to /usr/lib/tmpfiles.d (#1180984) - -* Mon Oct 27 2014 Pete Zaitcev 2.2.0-2 -- Intercept logging to local0.* and local2.* (#997983) - -* Sat Oct 18 2014 Alan Pevec 2.2.0-1 -- Update to Juno release 2.2.0 - -* Mon Oct 13 2014 Pete Zaitcev 2.2.0-0.2.rc1 -- Use After=network-online.target (#1150590) -- Change the permissions of service units to 644, avoid warning messages - -* Tue Oct 07 2014 Haikel Guemar 2.2.0-0.1.rc1 -- Update to upstream 2.2.0.rc1 - -* Fri Sep 19 2014 Pete Zaitcev - 2.1.0-2 -- Depend on python-keystonemiddleware instead of python-keystoneclient - -* Mon Sep 15 2014 Pete Zaitcev - 2.1.0-1 -- Update to upstream 2.1.0 - -* Thu Jul 10 2014 Pete Zaitcev - 2.0.0-1 -- Update to upstream 2.0.0, re-apply our patches - -* Fri Jun 27 2014 Pete Zaitcev - 1.13.1-5 -- Fix CVE-2014-3497, unquoted realm in WWW-Authenticate - -* Tue Jun 24 2014 Pete Zaitcev - 1.13.1-4 -- Move default ports from 600x to 620x (#1107907 and a dozen of others) - -* Mon Jun 23 2014 Pete Zaitcev - 1.13.1-3 -- Drop python-swiftclient to implement bz#1058131 in Rawhide - -* Sat Jun 07 2014 Fedora Release Engineering - 1.13.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Apr 19 2014 Pádraig Brady - 1.13.1-1 -- Update to Icehouse release - -* Sat Apr 12 2014 Alan Pevec 1.13.1-0.1.rc2 -- Update to Icehouse milestone 1.13.1.rc2 - -* Fri Jan 31 2014 Alan Pevec 1.12.0-1 -- Update to Icehouse milestone 1.12.0 - -* Fri Jan 03 2014 Pádraig Brady 1.11.0-1 -- Update to first icehouse release 1.11.0 - -* Wed Dec 04 2013 Pete Zaitcev 1.10.0-3 -- Change config modes to 640, like in every other OpenStack project - -* Fri Oct 18 2013 Pádraig Brady 1.10.0-2 -- Update to Havana GA -- Fix service startup issue due to bad depencency checking (#1020449) -- add swift home directory for signing_dir (#967631) - -* Wed Oct 09 2013 Pádraig Brady 1.10.0-0.1.rc1 -- Update to 1.10.0 RC1 - -* Mon Sep 23 2013 Pete Zaitcev 1.9.1-2 -- Move account/ to base package like we did for obj/ in 1.7.5-4 - -* Thu Sep 19 2013 Pete Zaitcev 1.9.1-1 -- Update to 1.9.1, includes CVE-2013-4155 -- Includes unfortunately standards-compliant XML listings, to be fixed -- Reseller prefix in Keystone must end with an underscore -- Make only proxy depend on openstack-swift-plugin-swift3 - -* Sat Aug 03 2013 Fedora Release Engineering - 1.9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jul 17 2013 Pete Zaitcev 1.9.0-1 -- Update to 1.9.0 - -* Fri Apr 05 2013 Derek Higgins - 1.8.0-2 -- change path to middleware in proxy conf file -- add dependency for python-keystoneclient for proxy - -* Thu Apr 4 2013 Pete Zaitcev 1.8.0-1 -- Update to 1.8.0; this is the "Grizzly" release of OpenStack - -* Mon Mar 18 2013 Pete Zaitcev 1.7.6-2 -- Move ownership of /var/cache/swift to main package per Zane's comments - -* Sun Mar 10 2013 Alan Pevec 1.7.6-1 -- Update to 1.7.6 - -* Thu Feb 14 2013 Pete Zaitcev - 1.7.5-4 -- Fix the moved object-expirer so it runs with object is not installed - -* Thu Feb 14 2013 Pete Zaitcev - 1.7.5-3 -- Add /var/cache/swift, by bz#870409, equally affects all Fedora versions - -* Mon Jan 28 2013 Pete Zaitcev - 1.7.5-2 -- Drop dependency on python-webob, because Swift uses an in-tree swob now -- Update scriptlets to use macro systemd_postun and friends (bz#850016) -- Drop systemd-sysv-convert -- Relocate object-expirer into the proxy bundle -- Add the expirer configuration, multi-node only - -* Mon Dec 03 2012 Derek Higgins - 1.7.5-1 -- Update to 1.7.5 -- adding swift-bench-client -- removing dup dependency on python-netifaces -- changing README -> README.md - -* Mon Nov 5 2012 Pete Zaitcev - 1.7.4-2 -- Add missing unit files bz#807170 - -* Thu Sep 27 2012 Derek Higgins - 1.7.4-1 -- Update to 1.7.4 - -* Thu Sep 20 2012 Derek Higgins 1.7.2-1 -- Update to 1.7.2 - -* Fri Sep 14 2012 Derek Higgins 1.7.0-2 -- Adding config files - -* Thu Sep 13 2012 Derek Higgins 1.7.0-1 -- Update to 1.7.0 - -* Mon Aug 13 2012 Alan Pevec 1.6.0-1 -- Update to 1.6.0 - -* Fri Jul 20 2012 Fedora Release Engineering - 1.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jun 15 2012 Alan Pevec 1.5.0-1 -- Update to 1.5.0 - -* Thu Mar 22 2012 Alan Pevec 1.4.8-1 -- Update to 1.4.8 - -* Fri Mar 09 2012 Alan Pevec 1.4.7-1 -- Update to 1.4.7 - -* Mon Feb 13 2012 Alan Pevec 1.4.6-1 -- Update to 1.4.6 -- Switch from SysV init scripts to systemd units rhbz#734594 - -* Thu Jan 26 2012 Alan Pevec 1.4.5-1 -- Update to 1.4.5 - -* Fri Jan 13 2012 Fedora Release Engineering - 1.4.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Nov 25 2011 Alan Pevec 1.4.4-1 -- Update to 1.4.4 - -* Wed Nov 23 2011 David Nalley -1.4.3-2 -* fixed some missing requires - -* Sat Nov 05 2011 David Nalley - 1.4.3-1 -- Update to 1.4.3 -- fix init script add, registration, deletion BZ 685155 -- fixing BR to facilitate epel6 building - -* Tue Aug 23 2011 David Nalley - 1.4.0-2 -- adding uid:gid for bz 732693 - -* Wed Jun 22 2011 David Nalley - 1.4.1-1 -- Update to 1.4.0 -- change the name of swift binary from st to swift - -* Sat Jun 04 2011 David Nalley - 1.4.0-1 -- Update to 1.4.0 - -* Fri May 20 2011 David Nalley - 1.3.0-1 -- Update to 1.3.0 - -* Tue Feb 08 2011 Fedora Release Engineering - 1.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Dec 05 2010 Silas Sewell - 1.1.0-1 -- Update to 1.1.0 - -* Sun Aug 08 2010 Silas Sewell - 1.0.2-5 -- Update for new Python macro guidelines -- Use dos2unix instead of sed -- Make gecos field more descriptive - -* Wed Jul 28 2010 Silas Sewell - 1.0.2-4 -- Rename to openstack-swift - -* Wed Jul 28 2010 Silas Sewell - 1.0.2-3 -- Fix return value in swift-functions - -* Tue Jul 27 2010 Silas Sewell - 1.0.2-2 -- Add swift user -- Update init scripts - -* Sun Jul 18 2010 Silas Sewell - 1.0.2-1 -- Initial build diff --git a/account-server.conf b/account-server.conf deleted file mode 100644 index 9fb0cc0..0000000 --- a/account-server.conf +++ /dev/null @@ -1,21 +0,0 @@ -[DEFAULT] - -# Make sure your swift-ring-builder arguments match the bind_ip and bind_port. -# You almost certainly do not want to listen just on loopback unless testing. -# However, you want to keep port 6202 if SElinux is enabled. -bind_ip = 127.0.0.1 -bind_port = 6202 - -workers = 2 - -[pipeline:main] -pipeline = account-server - -[app:account-server] -use = egg:swift#account - -[account-replicator] - -[account-auditor] - -[account-reaper] diff --git a/container-reconciler.conf b/container-reconciler.conf deleted file mode 100644 index 0a3de02..0000000 --- a/container-reconciler.conf +++ /dev/null @@ -1,52 +0,0 @@ -[DEFAULT] -# swift_dir = /etc/swift -# user = swift -# You can specify default log routing here if you want: -# log_name = swift -# log_facility = LOG_LOCAL0 -# log_level = INFO -# log_address = /dev/log -# -# comma separated list of functions to call to setup custom log handlers. -# functions get passed: conf, name, log_to_console, log_route, fmt, logger, -# adapted_logger -# log_custom_handlers = -# -# If set, log_udp_host will override log_address -# log_udp_host = -# log_udp_port = 514 -# -# You can enable StatsD logging here: -# log_statsd_host = localhost -# log_statsd_port = 8125 -# log_statsd_default_sample_rate = 1.0 -# log_statsd_sample_rate_factor = 1.0 -# log_statsd_metric_prefix = - -[container-reconciler] -# The reconciler will re-attempt reconciliation if the source object is not -# available up to reclaim_age seconds before it gives up and deletes the entry -# in the queue. -# reclaim_age = 604800 -# The cycle time of the daemon -# interval = 300 -# Server errors from requests will be retried by default -# request_tries = 3 - -[pipeline:main] -pipeline = catch_errors proxy-logging cache proxy-server - -[app:proxy-server] -use = egg:swift#proxy -# See proxy-server.conf-sample for options - -[filter:cache] -use = egg:swift#memcache -# See proxy-server.conf-sample for options - -[filter:proxy-logging] -use = egg:swift#proxy_logging - -[filter:catch_errors] -use = egg:swift#catch_errors -# See proxy-server.conf-sample for options diff --git a/container-server.conf b/container-server.conf deleted file mode 100644 index 6ec4630..0000000 --- a/container-server.conf +++ /dev/null @@ -1,23 +0,0 @@ -[DEFAULT] - -# Make sure your swift-ring-builder arguments match the bind_ip and bind_port. -# You almost certainly do not want to listen just on loopback unless testing. -# However, you want to keep port 6201 if SElinux is enabled. -bind_ip = 127.0.0.1 -bind_port = 6201 - -workers = 2 - -[pipeline:main] -pipeline = container-server - -[app:container-server] -use = egg:swift#container - -[container-replicator] - -[container-updater] - -[container-auditor] - -[container-sync] diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..491ce5f --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Regularly requires packages overrides, so it'll better maintained outside Fedora in rdoproject.org diff --git a/object-expirer.conf b/object-expirer.conf deleted file mode 100644 index b75963c..0000000 --- a/object-expirer.conf +++ /dev/null @@ -1,17 +0,0 @@ -[DEFAULT] - -[object-expirer] -# auto_create_account_prefix = . - -[pipeline:main] -pipeline = catch_errors cache proxy-server - -[app:proxy-server] -use = egg:swift#proxy - -[filter:cache] -use = egg:swift#memcache -memcache_servers = 127.0.0.1:11211 - -[filter:catch_errors] -use = egg:swift#catch_errors diff --git a/object-server.conf b/object-server.conf deleted file mode 100644 index 2c7cd83..0000000 --- a/object-server.conf +++ /dev/null @@ -1,21 +0,0 @@ -[DEFAULT] - -# Make sure your swift-ring-builder arguments match the bind_ip and bind_port. -# You almost certainly do not want to listen just on loopback unless testing. -# However, you want to keep port 6200 if SElinux is enabled. -bind_ip = 127.0.0.1 -bind_port = 6200 - -workers = 3 - -[pipeline:main] -pipeline = object-server - -[app:object-server] -use = egg:swift#object - -[object-replicator] - -[object-updater] - -[object-auditor] diff --git a/openstack-swift-account-auditor.service b/openstack-swift-account-auditor.service deleted file mode 100644 index 35413ce..0000000 --- a/openstack-swift-account-auditor.service +++ /dev/null @@ -1,12 +0,0 @@ -# After network.target just because. -[Unit] -Description=OpenStack Object Storage (swift) - Account Auditor -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-account-auditor /etc/swift/account-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-account-auditor@.service b/openstack-swift-account-auditor@.service deleted file mode 100644 index 8b44df9..0000000 --- a/openstack-swift-account-auditor@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Account Auditor instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-account-auditor /etc/swift/account-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-account-reaper.service b/openstack-swift-account-reaper.service deleted file mode 100644 index dd6fb00..0000000 --- a/openstack-swift-account-reaper.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Account Reaper -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-account-reaper /etc/swift/account-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-account-reaper@.service b/openstack-swift-account-reaper@.service deleted file mode 100644 index dbd5aa4..0000000 --- a/openstack-swift-account-reaper@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Account Reaper instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-account-reaper /etc/swift/account-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-account-replicator.service b/openstack-swift-account-replicator.service deleted file mode 100644 index 0cad889..0000000 --- a/openstack-swift-account-replicator.service +++ /dev/null @@ -1,12 +0,0 @@ -# After network.target just so replicator can talk to other nodes. -[Unit] -Description=OpenStack Object Storage (swift) - Account Replicator -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-account-replicator /etc/swift/account-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-account-replicator@.service b/openstack-swift-account-replicator@.service deleted file mode 100644 index 65fbaa3..0000000 --- a/openstack-swift-account-replicator@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Account Replicator instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-account-replicator /etc/swift/account-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-account.service b/openstack-swift-account.service deleted file mode 100644 index 190c4e7..0000000 --- a/openstack-swift-account.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Account Server -Wants=network-online.target -After=syslog.target network-online.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-account-server /etc/swift/account-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-account@.service b/openstack-swift-account@.service deleted file mode 100644 index 518c72d..0000000 --- a/openstack-swift-account@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Account Server instance %I -Wants=network-online.target -After=syslog.target network-online.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-account-server /etc/swift/account-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-container-auditor.service b/openstack-swift-container-auditor.service deleted file mode 100644 index 6359b91..0000000 --- a/openstack-swift-container-auditor.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Container Auditor -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-auditor /etc/swift/container-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-container-auditor@.service b/openstack-swift-container-auditor@.service deleted file mode 100644 index 7c046da..0000000 --- a/openstack-swift-container-auditor@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Container Auditor instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-auditor /etc/swift/container-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-container-reconciler.service b/openstack-swift-container-reconciler.service deleted file mode 100644 index f233451..0000000 --- a/openstack-swift-container-reconciler.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Container Reconciler -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-reconciler /etc/swift/container-reconciler.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-container-replicator.service b/openstack-swift-container-replicator.service deleted file mode 100644 index 399f7b4..0000000 --- a/openstack-swift-container-replicator.service +++ /dev/null @@ -1,12 +0,0 @@ -# After network.target just so replicator can talk to other nodes. -[Unit] -Description=OpenStack Object Storage (swift) - Container Replicator -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-replicator /etc/swift/container-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-container-replicator@.service b/openstack-swift-container-replicator@.service deleted file mode 100644 index 4803503..0000000 --- a/openstack-swift-container-replicator@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Container Replicator instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-replicator /etc/swift/container-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-container-updater.service b/openstack-swift-container-updater.service deleted file mode 100644 index 6efc57e..0000000 --- a/openstack-swift-container-updater.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Container Updater -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-updater /etc/swift/container-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-container-updater@.service b/openstack-swift-container-updater@.service deleted file mode 100644 index 19f99ff..0000000 --- a/openstack-swift-container-updater@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Container Updater instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-updater /etc/swift/container-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-container.service b/openstack-swift-container.service deleted file mode 100644 index 46752a4..0000000 --- a/openstack-swift-container.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Container Server -Wants=network-online.target -After=syslog.target network-online.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-server /etc/swift/container-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-container@.service b/openstack-swift-container@.service deleted file mode 100644 index ff65089..0000000 --- a/openstack-swift-container@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Container Server instance %I -Wants=network-online.target -After=syslog.target network-online.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-server /etc/swift/container-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-object-auditor.service b/openstack-swift-object-auditor.service deleted file mode 100644 index 498d53e..0000000 --- a/openstack-swift-object-auditor.service +++ /dev/null @@ -1,12 +0,0 @@ -# After network.target just because. -[Unit] -Description=OpenStack Object Storage (swift) - Object Auditor -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-auditor /etc/swift/object-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-object-auditor@.service b/openstack-swift-object-auditor@.service deleted file mode 100644 index f5c2537..0000000 --- a/openstack-swift-object-auditor@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Object Auditor instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-auditor /etc/swift/object-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-object-expirer.service b/openstack-swift-object-expirer.service deleted file mode 100644 index 0fbe2e5..0000000 --- a/openstack-swift-object-expirer.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Object Expirer -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-expirer /etc/swift/object-expirer.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-object-replicator.service b/openstack-swift-object-replicator.service deleted file mode 100644 index be1d3fa..0000000 --- a/openstack-swift-object-replicator.service +++ /dev/null @@ -1,12 +0,0 @@ -# After network.target just so replicator can talk to other nodes. -[Unit] -Description=OpenStack Object Storage (swift) - Object Replicator -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-replicator /etc/swift/object-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-object-replicator@.service b/openstack-swift-object-replicator@.service deleted file mode 100644 index 7493398..0000000 --- a/openstack-swift-object-replicator@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Object Replicator instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-replicator /etc/swift/object-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-object-updater.service b/openstack-swift-object-updater.service deleted file mode 100644 index d9697a5..0000000 --- a/openstack-swift-object-updater.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Object Updater -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-updater /etc/swift/object-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-object-updater@.service b/openstack-swift-object-updater@.service deleted file mode 100644 index 9f223c7..0000000 --- a/openstack-swift-object-updater@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Object Updater instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-updater /etc/swift/object-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-object.service b/openstack-swift-object.service deleted file mode 100644 index 3e57503..0000000 --- a/openstack-swift-object.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Object Server -Wants=network-online.target -After=syslog.target network-online.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-server /etc/swift/object-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-object@.service b/openstack-swift-object@.service deleted file mode 100644 index 4199e68..0000000 --- a/openstack-swift-object@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Object Server instance %I -Wants=network-online.target -After=syslog.target network-online.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-server /etc/swift/object-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift-proxy.service b/openstack-swift-proxy.service deleted file mode 100644 index d22e882..0000000 --- a/openstack-swift-proxy.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Proxy Server -Wants=network-online.target -After=syslog.target network-online.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-proxy-server /etc/swift/proxy-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack-swift.logrotate b/openstack-swift.logrotate deleted file mode 100644 index f38e268..0000000 --- a/openstack-swift.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/swift/swift.log -{ - postrotate - /bin/kill -HUP `cat /var/run/syslogd.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/openstack-swift.rsyslog b/openstack-swift.rsyslog deleted file mode 100644 index 3473748..0000000 --- a/openstack-swift.rsyslog +++ /dev/null @@ -1,5 +0,0 @@ -# LOCAL0 is the upstream default. LOCAL1, LOCAL2 are configured in -# RHOS and RDO if installed with Packstack (also, mentioned in docs). -# The breakout action prevents logging into /var/log/messages, bz#997983. -local0.*;local1.*;local2.* /var/log/swift/swift.log -& ~ diff --git a/openstack-swift.spec b/openstack-swift.spec deleted file mode 100644 index f96aea4..0000000 --- a/openstack-swift.spec +++ /dev/null @@ -1,475 +0,0 @@ -%global release_name liberty -%global service swift - -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} - -Name: openstack-swift -Version: 2.5.0 -Release: 2%{?milestone}%{?dist} -Summary: OpenStack Object Storage (Swift) - -License: ASL 2.0 -URL: http://launchpad.net/swift -Source0: http://launchpad.net/%{service}/%{release_name}/%{version}/+download/%{service}-%{upstream_version}.tar.gz - -Patch0001: 0001-remove-runtime-requirement-on-pbr.patch -Patch0002: 0002-Add-fixes-for-building-the-doc-package.patch - -Source2: %{name}-account.service -Source21: %{name}-account@.service -Source22: account-server.conf -Source23: %{name}-account-replicator.service -Source24: %{name}-account-replicator@.service -Source25: %{name}-account-auditor.service -Source26: %{name}-account-auditor@.service -Source27: %{name}-account-reaper.service -Source28: %{name}-account-reaper@.service -Source4: %{name}-container.service -Source41: %{name}-container@.service -Source42: container-server.conf -Source43: %{name}-container-replicator.service -Source44: %{name}-container-replicator@.service -Source45: %{name}-container-auditor.service -Source46: %{name}-container-auditor@.service -Source47: %{name}-container-updater.service -Source48: %{name}-container-updater@.service -Source5: %{name}-object.service -Source51: %{name}-object@.service -Source52: object-server.conf -Source53: %{name}-object-replicator.service -Source54: %{name}-object-replicator@.service -Source55: %{name}-object-auditor.service -Source56: %{name}-object-auditor@.service -Source57: %{name}-object-updater.service -Source58: %{name}-object-updater@.service -Source59: %{name}-object-expirer.service -Source63: %{name}-container-reconciler.service -Source6: %{name}-proxy.service -Source61: proxy-server.conf -Source62: object-expirer.conf -Source64: container-reconciler.conf -Source20: %{name}.tmpfs -Source7: swift.conf -Source71: %{name}.rsyslog -Source72: %{name}.logrotate - -## Based at https://github.com/redhat-openstack/swift/ - -BuildArch: noarch -BuildRequires: python-devel -BuildRequires: python-setuptools -BuildRequires: python-pbr -BuildRequires: python-six -Requires: python-configobj -Requires: python-eventlet >= 0.16.1 -Requires: python-greenlet >= 0.3.1 -Requires: python-paste-deploy -Requires: python-simplejson -Requires: pyxattr -Requires: python-setuptools -Requires: python-six -Requires: python-netifaces -Requires: python-dns -Requires: python-pyeclib - -BuildRequires: systemd -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -Requires(pre): shadow-utils -Obsoletes: openstack-swift-auth <= 1.4.0 - -%description -OpenStack Object Storage (Swift) aggregates commodity servers to work together -in clusters for reliable, redundant, and large-scale storage of static objects. -Objects are written to multiple hardware devices in the data center, with the -OpenStack software responsible for ensuring data replication and integrity -across the cluster. Storage clusters can scale horizontally by adding new nodes, -which are automatically configured. Should a node fail, OpenStack works to -replicate its content from other active nodes. Because OpenStack uses software -logic to ensure data replication and distribution across different devices, -inexpensive commodity hard drives and servers can be used in lieu of more -expensive equipment. - -%package account -Summary: Account services for Swift - -Requires: %{name} = %{version}-%{release} - -%description account -OpenStack Object Storage (Swift) aggregates commodity servers to work together -in clusters for reliable, redundant, and large-scale storage of static objects. - -This package contains the %{name} account server. - -%package container -Summary: Container services for Swift - -Requires: %{name} = %{version}-%{release} - -%description container -OpenStack Object Storage (Swift) aggregates commodity servers to work together -in clusters for reliable, redundant, and large-scale storage of static objects. - -This package contains the %{name} container server. - -%package object -Summary: Object services for Swift - -Requires: %{name} = %{version}-%{release} -Requires: rsync >= 3.0 - -%description object -OpenStack Object Storage (Swift) aggregates commodity servers to work together -in clusters for reliable, redundant, and large-scale storage of static objects. - -This package contains the %{name} object server. - -%package proxy -Summary: A proxy server for Swift - -Requires: %{name} = %{version}-%{release} -Requires: python-keystonemiddleware -Requires: openstack-swift-plugin-swift3 -Requires: openstack-swift-container - -%description proxy -OpenStack Object Storage (Swift) aggregates commodity servers to work together -in clusters for reliable, redundant, and large-scale storage of static objects. - -This package contains the %{name} proxy server. - -%package doc -Summary: Documentation for %{name} - -BuildRequires: python-sphinx >= 1.0 -BuildRequires: python-oslo-sphinx >= 2.5.0 -# Required for generating docs (otherwise py-modindex.html is missing) -BuildRequires: python-eventlet -BuildRequires: pyxattr - -%description doc -OpenStack Object Storage (Swift) aggregates commodity servers to work together -in clusters for reliable, redundant, and large-scale storage of static objects. - -This package contains documentation files for %{name}. - -%prep -%setup -q -n swift-%{upstream_version} - -%patch0001 -p1 -%patch0002 -p1 - -# Let RPM handle the dependencies -rm -f requirements.txt - -%build -%{__python2} setup.py build -# Fails unless we create the build directory -mkdir -p doc/build -# Build docs -%{__python2} setup.py build_sphinx -# Fix hidden-file-or-dir warning -#rm doc/build/html/.buildinfo - -%install -%{__python2} setup.py install -O1 --skip-build --root %{buildroot} -# systemd units -install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}-account.service -install -p -D -m 644 %{SOURCE21} %{buildroot}%{_unitdir}/%{name}-account@.service -install -p -D -m 644 %{SOURCE23} %{buildroot}%{_unitdir}/%{name}-account-replicator.service -install -p -D -m 644 %{SOURCE24} %{buildroot}%{_unitdir}/%{name}-account-replicator@.service -install -p -D -m 644 %{SOURCE25} %{buildroot}%{_unitdir}/%{name}-account-auditor.service -install -p -D -m 644 %{SOURCE26} %{buildroot}%{_unitdir}/%{name}-account-auditor@.service -install -p -D -m 644 %{SOURCE27} %{buildroot}%{_unitdir}/%{name}-account-reaper.service -install -p -D -m 644 %{SOURCE28} %{buildroot}%{_unitdir}/%{name}-account-reaper@.service -install -p -D -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}-container.service -install -p -D -m 644 %{SOURCE41} %{buildroot}%{_unitdir}/%{name}-container@.service -install -p -D -m 644 %{SOURCE43} %{buildroot}%{_unitdir}/%{name}-container-replicator.service -install -p -D -m 644 %{SOURCE44} %{buildroot}%{_unitdir}/%{name}-container-replicator@.service -install -p -D -m 644 %{SOURCE45} %{buildroot}%{_unitdir}/%{name}-container-auditor.service -install -p -D -m 644 %{SOURCE46} %{buildroot}%{_unitdir}/%{name}-container-auditor@.service -install -p -D -m 644 %{SOURCE47} %{buildroot}%{_unitdir}/%{name}-container-updater.service -install -p -D -m 644 %{SOURCE48} %{buildroot}%{_unitdir}/%{name}-container-updater@.service -install -p -D -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}-object.service -install -p -D -m 644 %{SOURCE51} %{buildroot}%{_unitdir}/%{name}-object@.service -install -p -D -m 644 %{SOURCE53} %{buildroot}%{_unitdir}/%{name}-object-replicator.service -install -p -D -m 644 %{SOURCE54} %{buildroot}%{_unitdir}/%{name}-object-replicator@.service -install -p -D -m 644 %{SOURCE55} %{buildroot}%{_unitdir}/%{name}-object-auditor.service -install -p -D -m 644 %{SOURCE56} %{buildroot}%{_unitdir}/%{name}-object-auditor@.service -install -p -D -m 644 %{SOURCE57} %{buildroot}%{_unitdir}/%{name}-object-updater.service -install -p -D -m 644 %{SOURCE58} %{buildroot}%{_unitdir}/%{name}-object-updater@.service -install -p -D -m 644 %{SOURCE59} %{buildroot}%{_unitdir}/%{name}-object-expirer.service -install -p -D -m 644 %{SOURCE63} %{buildroot}%{_unitdir}/%{name}-container-reconciler.service -install -p -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}-proxy.service -# Remove tests -rm -fr %{buildroot}/%{python2_sitelib}/test -# Misc other -install -d -m 755 %{buildroot}%{_sysconfdir}/swift -install -d -m 755 %{buildroot}%{_sysconfdir}/swift/account-server -install -d -m 755 %{buildroot}%{_sysconfdir}/swift/container-server -install -d -m 755 %{buildroot}%{_sysconfdir}/swift/object-server -install -d -m 755 %{buildroot}%{_sysconfdir}/swift/proxy-server -# Config files -install -p -D -m 660 %{SOURCE22} %{buildroot}%{_sysconfdir}/swift/account-server.conf -install -p -D -m 660 %{SOURCE42} %{buildroot}%{_sysconfdir}/swift/container-server.conf -install -p -D -m 660 %{SOURCE52} %{buildroot}%{_sysconfdir}/swift/object-server.conf -install -p -D -m 660 %{SOURCE61} %{buildroot}%{_sysconfdir}/swift/proxy-server.conf -install -p -D -m 660 %{SOURCE62} %{buildroot}%{_sysconfdir}/swift/object-expirer.conf -install -p -D -m 660 %{SOURCE64} %{buildroot}%{_sysconfdir}/swift/container-reconciler.conf -install -p -D -m 660 %{SOURCE7} %{buildroot}%{_sysconfdir}/swift/swift.conf -# Install pid directory -install -d -m 755 %{buildroot}%{_localstatedir}/run/swift -install -d -m 755 %{buildroot}%{_localstatedir}/run/swift/account-server -install -d -m 755 %{buildroot}%{_localstatedir}/run/swift/container-server -install -d -m 755 %{buildroot}%{_localstatedir}/run/swift/object-server -install -d -m 755 %{buildroot}%{_localstatedir}/run/swift/proxy-server -# syslog -install -d -m 755 %{buildroot}%{_localstatedir}/log/swift -install -p -D -m 644 %{SOURCE71} %{buildroot}%{_sysconfdir}/rsyslog.d/openstack-swift.conf -install -p -D -m 644 %{SOURCE72} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-swift -# Swift run directories -install -p -D -m 644 %{SOURCE20} %{buildroot}%{_libdir}/tmpfiles.d/openstack-swift.conf -# Install recon directory -install -d -m 755 %{buildroot}%{_localstatedir}/cache/swift -# Install home directory -install -d -m 755 %{buildroot}%{_sharedstatedir}/swift -# man pages -install -d -m 755 %{buildroot}%{_mandir}/man5 -for m in doc/manpages/*.5; do - install -p -m 0644 $m %{buildroot}%{_mandir}/man5 -done -install -d -m 755 %{buildroot}%{_mandir}/man1 -for m in doc/manpages/*.1; do - install -p -m 0644 $m %{buildroot}%{_mandir}/man1 -done - -%clean -rm -rf %{buildroot} - -%pre -getent group swift >/dev/null || groupadd -r swift -g 160 -getent passwd swift >/dev/null || \ -useradd -r -g swift -u 160 -d %{_sharedstatedir}/swift -s /sbin/nologin \ --c "OpenStack Swift Daemons" swift -exit 0 - -%post account -%systemd_post %{name}-account.service -%systemd_post %{name}-account-replicator.service -%systemd_post %{name}-account-auditor.service -%systemd_post %{name}-account-reaper.service - -%preun account -%systemd_preun %{name}-account.service -%systemd_preun %{name}-account-replicator.service -%systemd_preun %{name}-account-auditor.service -%systemd_preun %{name}-account-reaper.service - -%postun account -%systemd_postun %{name}-account.service -%systemd_postun %{name}-account-replicator.service -%systemd_postun %{name}-account-auditor.service -%systemd_postun %{name}-account-reaper.service - -%post container -%systemd_post %{name}-container.service -%systemd_post %{name}-container-replicator.service -%systemd_post %{name}-container-auditor.service -%systemd_post %{name}-container-updater.service - -%preun container -%systemd_preun %{name}-container.service -%systemd_preun %{name}-container-replicator.service -%systemd_preun %{name}-container-auditor.service -%systemd_preun %{name}-container-updater.service - -%postun container -%systemd_postun %{name}-container.service -%systemd_postun %{name}-container-replicator.service -%systemd_postun %{name}-container-auditor.service -%systemd_postun %{name}-container-updater.service - -%post object -%systemd_post %{name}-object.service -%systemd_post %{name}-object-replicator.service -%systemd_post %{name}-object-auditor.service -%systemd_post %{name}-object-updater.service - -%preun object -%systemd_preun %{name}-object.service -%systemd_preun %{name}-object-replicator.service -%systemd_preun %{name}-object-auditor.service -%systemd_preun %{name}-object-updater.service - -%postun object -%systemd_postun %{name}-object.service -%systemd_postun %{name}-object-replicator.service -%systemd_postun %{name}-object-auditor.service -%systemd_postun %{name}-object-updater.service - -%post proxy -%systemd_post %{name}-proxy.service -%systemd_post %{name}-object-expirer.service - -%preun proxy -%systemd_preun %{name}-proxy.service -%systemd_preun %{name}-object-expirer.service - -%postun proxy -%systemd_postun %{name}-proxy.service -%systemd_postun %{name}-object-expirer.service - -%files -%defattr(-,root,root,-) -%license LICENSE -%doc README.md -%doc etc/dispersion.conf-sample etc/drive-audit.conf-sample etc/object-expirer.conf-sample -%doc etc/swift.conf-sample -%{_mandir}/man5/dispersion.conf.5* -%{_mandir}/man1/swift-dispersion-populate.1* -%{_mandir}/man1/swift-dispersion-report.1* -%{_mandir}/man1/swift-get-nodes.1* -%{_mandir}/man1/swift-init.1* -%{_mandir}/man1/swift-orphans.1* -%{_mandir}/man1/swift-recon.1* -%{_mandir}/man1/swift-ring-builder.1* -%{_libdir}/tmpfiles.d/openstack-swift.conf -%dir %{_sysconfdir}/swift -%config(noreplace) %attr(640, root, swift) %{_sysconfdir}/swift/swift.conf -%config(noreplace) %{_sysconfdir}/rsyslog.d/openstack-swift.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-swift -%dir %{_localstatedir}/log/swift -%dir %attr(0755, swift, root) %{_localstatedir}/run/swift -%dir %attr(0755, swift, root) %{_localstatedir}/cache/swift -%dir %attr(0755, swift, root) %{_sharedstatedir}/swift -%dir %{python2_sitelib}/swift -%{_bindir}/swift-account-audit -%{_bindir}/swift-config -%{_bindir}/swift-drive-audit -%{_bindir}/swift-get-nodes -%{_bindir}/swift-init -%{_bindir}/swift-ring-builder -%{_bindir}/swift-ring-builder-analyzer -%{_bindir}/swift-dispersion-populate -%{_bindir}/swift-dispersion-report -%{_bindir}/swift-recon* -%{_bindir}/swift-oldies -%{_bindir}/swift-orphans -%{_bindir}/swift-form-signature -%{_bindir}/swift-temp-url -%{python2_sitelib}/swift/*.py* -%{python2_sitelib}/swift/cli -%{python2_sitelib}/swift/common -%{python2_sitelib}/swift/account -%{python2_sitelib}/swift/obj -%{python2_sitelib}/swift/locale -%{python2_sitelib}/swift-%{version}*.egg-info - -%files account -%defattr(-,root,root,-) -%doc etc/account-server.conf-sample -%{_mandir}/man5/account-server.conf.5* -%{_mandir}/man1/swift-account-auditor.1* -%{_mandir}/man1/swift-account-info.1* -%{_mandir}/man1/swift-account-reaper.1* -%{_mandir}/man1/swift-account-replicator.1* -%{_mandir}/man1/swift-account-server.1* -%{_unitdir}/%{name}-account*.service -%dir %{_sysconfdir}/swift/account-server -%config(noreplace) %attr(640, root, swift) %{_sysconfdir}/swift/account-server.conf -%dir %attr(0755, swift, root) %{_localstatedir}/run/swift/account-server -%{_bindir}/swift-account-auditor -%{_bindir}/swift-account-info -%{_bindir}/swift-account-reaper -%{_bindir}/swift-account-replicator -%{_bindir}/swift-account-server - -%files container -%defattr(-,root,root,-) -%doc etc/container-server.conf-sample -%{_mandir}/man5/container-server.conf.5* -%{_mandir}/man1/swift-container-auditor.1* -%{_mandir}/man1/swift-container-info.1* -%{_mandir}/man1/swift-container-replicator.1* -%{_mandir}/man1/swift-container-server.1* -%{_mandir}/man1/swift-container-sync.1* -%{_mandir}/man1/swift-container-updater.1* -%{_unitdir}/%{name}-container*.service -%dir %{_sysconfdir}/swift/container-server -%config(noreplace) %attr(640, root, swift) %{_sysconfdir}/swift/container-server.conf -%dir %attr(0755, swift, root) %{_localstatedir}/run/swift/container-server -%{_bindir}/swift-container-auditor -%{_bindir}/swift-container-info -%{_bindir}/swift-container-server -%{_bindir}/swift-container-replicator -%{_bindir}/swift-container-updater -%{_bindir}/swift-container-sync -%{python2_sitelib}/swift/container - -%files object -%defattr(-,root,root,-) -%doc etc/object-server.conf-sample etc/rsyncd.conf-sample -%{_mandir}/man5/object-server.conf.5* -%{_mandir}/man1/swift-object-auditor.1* -%{_mandir}/man1/swift-object-info.1* -%{_mandir}/man1/swift-object-replicator.1* -%{_mandir}/man1/swift-object-server.1* -%{_mandir}/man1/swift-object-updater.1* -%{_unitdir}/%{name}-object.service -%{_unitdir}/%{name}-object@.service -%{_unitdir}/%{name}-object-auditor.service -%{_unitdir}/%{name}-object-auditor@.service -%{_unitdir}/%{name}-object-replicator.service -%{_unitdir}/%{name}-object-replicator@.service -%{_unitdir}/%{name}-object-updater.service -%{_unitdir}/%{name}-object-updater@.service -%dir %{_sysconfdir}/swift/object-server -%config(noreplace) %attr(640, root, swift) %{_sysconfdir}/swift/object-server.conf -%dir %attr(0755, swift, root) %{_localstatedir}/run/swift/object-server -%{_bindir}/swift-object-auditor -%{_bindir}/swift-object-info -%{_bindir}/swift-object-replicator -%{_bindir}/swift-object-server -%{_bindir}/swift-object-updater -%{_bindir}/swift-object-reconstructor - -%files proxy -%defattr(-,root,root,-) -%doc etc/proxy-server.conf-sample etc/object-expirer.conf-sample -%{_mandir}/man5/object-expirer.conf.5* -%{_mandir}/man5/proxy-server.conf.5* -%{_mandir}/man1/swift-object-expirer.1* -%{_mandir}/man1/swift-proxy-server.1* -%{_unitdir}/%{name}-container-reconciler.service -%{_unitdir}/%{name}-object-expirer.service -%{_unitdir}/%{name}-proxy.service -%dir %{_sysconfdir}/swift/proxy-server -%config(noreplace) %attr(640, root, swift) %{_sysconfdir}/swift/container-reconciler.conf -%config(noreplace) %attr(640, root, swift) %{_sysconfdir}/swift/proxy-server.conf -%config(noreplace) %attr(640, root, swift) %{_sysconfdir}/swift/object-expirer.conf -%dir %attr(0755, swift, root) %{_localstatedir}/run/swift/proxy-server -%{_bindir}/swift-container-reconciler -%{_bindir}/swift-object-expirer -%{_bindir}/swift-proxy-server -%{python2_sitelib}/swift/proxy - -%files doc -%defattr(-,root,root,-) -%doc LICENSE doc/build/html - -%changelog -* Thu Feb 04 2016 Fedora Release Engineering - 2.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Oct 16 2015 Haikel Guemar 2.5.0-1 -- Update to upstream 2.5.0 - -* Wed Sep 30 2015 Haikel Guemar 2.4.0-1 -- Update to upstream 2.4.0 - -* Thu Jun 18 2015 Fedora Release Engineering - 2.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Apr 30 2015 Alan Pevec 2015.1.0-1 -- OpenStack Kilo release diff --git a/openstack-swift.tmpfs b/openstack-swift.tmpfs deleted file mode 100644 index 8f4f5a5..0000000 --- a/openstack-swift.tmpfs +++ /dev/null @@ -1,6 +0,0 @@ -# swift needs a couple of directories in /var/run -d /var/run/swift 0755 swift root -d /var/run/swift/account-server 0755 swift root -d /var/run/swift/container-server 0755 swift root -d /var/run/swift/object-server 0755 swift root -d /var/run/swift/proxy-server 0755 swift root diff --git a/proxy-server.conf b/proxy-server.conf deleted file mode 100644 index 3082c85..0000000 --- a/proxy-server.conf +++ /dev/null @@ -1,62 +0,0 @@ -[DEFAULT] -bind_port = 8080 -workers = 8 -user = swift - -[pipeline:main] -pipeline = catch_errors gatekeeper healthcheck proxy-logging cache authtoken keystone slo dlo proxy-logging proxy-server - -[app:proxy-server] -use = egg:swift#proxy -allow_account_management = true -account_autocreate = true - -[filter:healthcheck] -use = egg:swift#healthcheck - -[filter:cache] -use = egg:swift#memcache -memcache_servers = 127.0.0.1:11211 - -[filter:catch_errors] -use = egg:swift#catch_errors - -[filter:proxy-logging] -use = egg:swift#proxy_logging -# -# Note: The double proxy-logging in the pipeline is not a mistake. The -# left-most proxy-logging is there to log requests that were handled in -# middleware and never made it through to the right-most middleware (and -# proxy server). Double logging is prevented for normal requests. See -# proxy-logging docs. - -# Note: Put after auth and staticweb in the pipeline. -[filter:slo] -use = egg:swift#slo - -# Note: Put after auth and staticweb in the pipeline. -[filter:dlo] -use = egg:swift#dlo - -[filter:gatekeeper] -use = egg:swift#gatekeeper - -[filter:proxy-logging] -use = egg:swift#proxy_logging - -[filter:keystone] -use = egg:swift#keystoneauth -operator_roles = admin, SwiftOperator -is_admin = true -cache = swift.cache - -[filter:authtoken] -paste.filter_factory = keystonemiddleware.auth_token:filter_factory -admin_tenant_name = %SERVICE_TENANT_NAME% -admin_user = %SERVICE_USER% -admin_password = %SERVICE_PASSWORD% -# -identity_uri = http://localhost:35357/ -auth_uri = http://localhost:5000/ -# -signing_dir = /tmp/keystone-signing-swift diff --git a/sources b/sources deleted file mode 100644 index 370e122..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -7ff90a766fee25475c08846e80dee3d9 swift-2.5.0.tar.gz diff --git a/swift.conf b/swift.conf deleted file mode 100644 index adbd96f..0000000 --- a/swift.conf +++ /dev/null @@ -1,2 +0,0 @@ -[swift-hash] -swift_hash_path_suffix = %SWIFT_HASH_PATH_SUFFIX%