From 3d8b1bd3d93fb23b92d88f35e0a09e07d2f22e31 Mon Sep 17 00:00:00 2001
From: dodger <dodger@ciberterminal.net>
Date: Mon, 9 May 2022 18:05:15 +0200
Subject: [PATCH] Merged documentation

---
 README.md     | 13 ++++++++++++-
 README_rds.md | 42 ------------------------------------------
 2 files changed, 12 insertions(+), 43 deletions(-)
 delete mode 100644 README_rds.md

diff --git a/README.md b/README.md
index 6c2e6cc..765bcd4 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ All without granting `super` permissions and having a histoc of changes on a _ps
 
 | :warning: WARNING          |
 |:---------------------------|
-| Amazon RDS has its own instructions on README_rds.md |
+| Amazon RDS has some notes at the end... |
 | :warning: WARNING          |
 
 ## Instructions
@@ -48,3 +48,14 @@ dodger@ciberterminal.net $ bash password_creator.sh
 select dba.change_my_password('<Wl}TxqRPBQaV_N<rU#A') ;
 -- ##############################################
 ```
+
+
+## RDS considerations
+
+As Amazon has modified Postgresql so you don't have access as a *real* superuser, the _dangerous_ function
+`change_valid_until` should run as the owner of the database (the user created when you deploy the database through AWS)
+
+There's a `passchanger_rds.sqlp` file which should be used instead of the normal one.
+
+
+
diff --git a/README_rds.md b/README_rds.md
deleted file mode 100644
index be51db5..0000000
--- a/README_rds.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# PostgreSQL expiration date management functions
-
-## Description
-
-This project tries to find a way to allow users the management of the `VALID UNTIL` expiration clause by themself.
-All without granting `super` permissions and having a histoc of changes on a _pseudo-audit_ table
-
-## PRE-requisites
-
-As Amazon has modified Postgresql so you don't have access as a *real* superuser, the _dangerous_ function
-`change_valid_until` should run as the owner of the database (the user created when you deploy the database through AWS)
-
-
-
-## Instructions
-
-### First deploy
-Deploy `passchanger_rds.sql` on the desired cluster/database.
-
-It will:
-  * create a `dba` schema
-  * create a `dba` role
-  * create the `pwdhistory` table for audit purpouses
-  * Grant the minimum permissions for this new role so the whole thing works
-  * Create the 2 needed functions and grant permissions on them to `dba`
-
-
-### Allowing users to use that functions
-Take the file `grants_to_grant.sql` and modify the username _dodger_ so it match the username that should have the permissions.
-Execute the grants on the cluster/database you have deployed `passchanger.sql`
-
-
-### Changing password & extending expiration date
-
-The user should just execute:
-```
-select dba.change_my_password('YOUR_NEW_GENERATED_PASSWORD_NOT_THIS_ONE') ;
-```
-
-## Helper script
-
-See README.md