diff --git a/LICENSE b/LICENSE index 605b7b41..39edb68c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 Compose, Zalando SE +Copyright (c) 2024 Compose, Zalando SE, Patroni Contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.rst b/README.rst index 29c16735..7500612e 100644 --- a/README.rst +++ b/README.rst @@ -27,9 +27,7 @@ Currently supported PostgreSQL versions: 9.3 to 16. How Patroni Works ================= -Patroni originated as a fork of `Governor `__, the project from Compose. It includes plenty of new features. - -For an example of a Docker-based deployment with Patroni, see `Spilo `__, currently in use at Zalando. +Patroni (formerly known as Zalando's Patroni) originated as a fork of `Governor `__, the project from Compose. It includes plenty of new features. For additional background info, see: diff --git a/docs/README.rst b/docs/README.rst index 61c428e2..e7f1038b 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -6,8 +6,6 @@ Introduction Patroni is a template for high availability (HA) PostgreSQL solutions using Python. Patroni originated as a fork of `Governor `__, the project from Compose. It includes plenty of new features. -For an example of a Docker-based deployment with Patroni, see `Spilo `__, currently in use at Zalando. - For additional background info, see: * `PostgreSQL HA with Kubernetes and Patroni `__, talk by Josh Berkus at KubeCon 2016 (video) diff --git a/docs/conf.py b/docs/conf.py index d26ec84e..de409c83 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -77,8 +77,8 @@ master_doc = 'index' # General information about the project. project = 'Patroni' -copyright = '2015 Compose, Zalando SE' -author = 'Zalando SE' +copyright = '2024 Compose, Zalando SE, Patroni Contributors' +author = 'Patroni Contributors' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -191,7 +191,7 @@ latex_elements = { # author, documentclass [howto, manual, or own class]). latex_documents = [ (master_doc, 'Patroni.tex', 'Patroni Documentation', - 'Zalando SE', 'manual'), + 'Patroni Contributors', 'manual'), ] diff --git a/docs/kubernetes.rst b/docs/kubernetes.rst index b9456f2a..ab9acdda 100644 --- a/docs/kubernetes.rst +++ b/docs/kubernetes.rst @@ -98,5 +98,5 @@ Examples to deploy the Spilo image configured with Patroni running using Kubernetes. - In order to run your database clusters at scale using Patroni and Spilo, take a look at the - `postgres-operator `_ project. It implements the operator pattern + `postgres-operator `_ project. It implements the operator pattern to manage Spilo clusters. diff --git a/docs/patronictl.rst b/docs/patronictl.rst index 3c043a66..73cde1d5 100644 --- a/docs/patronictl.rst +++ b/docs/patronictl.rst @@ -1065,7 +1065,7 @@ Run a SQL command as ``postgres`` user, and take password from ``libpq`` environ .. code:: bash - $ PGPASSWORD=zalando patronictl -c postgres0.yml query batman -U postgres -c "SELECT now()" + $ PGPASSWORD=patroni patronictl -c postgres0.yml query batman -U postgres -c "SELECT now()" now 2023-09-12 18:11:37.639500+00:00 diff --git a/features/environment.py b/features/environment.py index 8aa20567..9f9d5fa7 100644 --- a/features/environment.py +++ b/features/environment.py @@ -893,7 +893,7 @@ class PatroniPoolController(object): .format(os.path.join(self.patroni_path, 'data', 'wal_archive_clone').replace('\\', '/')) }, 'authentication': { - 'superuser': {'password': 'zalando1'}, + 'superuser': {'password': 'patroni1'}, 'replication': {'password': 'rep-pass1'} } } @@ -925,7 +925,7 @@ class PatroniPoolController(object): }, 'postgresql': { 'authentication': { - 'superuser': {'password': 'zalando2'}, + 'superuser': {'password': 'patroni2'}, 'replication': {'password': 'rep-pass2'} } } diff --git a/postgres0.yml b/postgres0.yml index 1232ab4a..3dc0aa18 100644 --- a/postgres0.yml +++ b/postgres0.yml @@ -112,7 +112,7 @@ postgresql: password: rep-pass superuser: username: postgres - password: zalando + password: patroni rewind: # Has no effect on postgres 10 and lower username: rewind_user password: rewind_password diff --git a/postgres1.yml b/postgres1.yml index c86e8790..e45e6e25 100644 --- a/postgres1.yml +++ b/postgres1.yml @@ -105,7 +105,7 @@ postgresql: password: rep-pass superuser: username: postgres - password: zalando + password: patroni rewind: # Has no effect on postgres 10 and lower username: rewind_user password: rewind_password diff --git a/postgres2.yml b/postgres2.yml index 7384568e..39f27771 100644 --- a/postgres2.yml +++ b/postgres2.yml @@ -102,7 +102,7 @@ postgresql: password: rep-pass superuser: username: postgres - password: zalando + password: patroni rewind: # Has no effect on postgres 10 and lower username: rewind_user password: rewind_password diff --git a/tests/test_config.py b/tests/test_config.py index 5b10dfc0..6cad071d 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -73,7 +73,7 @@ class TestConfig(unittest.TestCase): 'PATRONI_RAFT_PARTNER_ADDRS': "'host1:1234','host2:1234'", 'PATRONI_foo_HOSTS': '[host1,host2', # Exception in parse_list 'PATRONI_SUPERUSER_USERNAME': 'postgres', - 'PATRONI_SUPERUSER_PASSWORD': 'zalando', + 'PATRONI_SUPERUSER_PASSWORD': 'patroni', 'PATRONI_REPLICATION_USERNAME': 'replicator', 'PATRONI_REPLICATION_PASSWORD': 'rep-pass', 'PATRONI_admin_PASSWORD': 'admin',