Merge pull request #7 from PaaS-TA/jammy

[PAAS-TA-APP-LIFECYCLE-SERVICE-RELEASE] Jammy

README.md

@@ -85,29 +85,33 @@
 - Download & Copy "source files" into the src directory
     ```
     ## download source files
-    $ wget -O src.zip  https://nextcloud.paas-ta.org/index.php/s/qksWX6iygDeQRSg/download
+    $ wget -O src.zip  https://nextcloud.paas-ta.org/index.php/s/w2YX6w64D5Baj6D/download
     
     ## unzip download source files
     $ unzip src.zip 
     
     ## final src directory
-    src  
-        ├── app-lifecycle  
-        │   ├── taiga-back-4.2.12.tar.gz  
-        │   └── taiga-front-dist-4.2.12-stable.tar.gz  
-        ├── common  
-        │   ├── pid_utils.sh  
-        │   └── syslog_utils.sh  
-        ├── java  
-        │   └── OpenJDK8U-jre_x64_linux_hotspot_8u212b03.tar.gz  
-        ├── mariadb  
-        │   └── mariadb-10.5.17-linux-x86_64.tar.gz  
-        ├── nginx  
-        │   └── nginx-1.21.3.tar.gz
-        ├── postgres 
-        │   └── postgresql-11.17.tar.gz
-        └── service-broker  
-        │   └── paasta-app-lifecycle-service-broker.jar    
+    src
+    ├── common
+    │   ├── pid_utils.sh
+    │   └── syslog_utils.sh
+    ├── java
+    │   └── OpenJDK8U-jre_x64_linux_hotspot_8u212b03.tar.gz
+    ├── mariadb
+    │   └── mariadb-10.5.17-linux-x86_64.tar.gz
+    ├── nginx
+    │   └── nginx-1.21.3.tar.gz
+    ├── postgres
+    │   ├── downloaurl
+    │   └── postgresql-11.17.tar.gz
+    ├── service-broker
+    │   └── paasta-app-lifecycle-service-broker.jar
+    ├── taiga-back
+    │   ├── get-pip.py
+    │   ├── gosu-amd64
+    │   └── taiga-back-6.7.0.zip
+    └── taiga-front
+        └── taiga-front-dist-6.7.0.zip
     ```
 - Create APP Lifecycle Release
     ```

jobs/mariadb/templates/bin/pre-start.erb

@@ -16,6 +16,9 @@ RUN_DIR=/var/vcap/sys/run/${JOB_NAME}
 LOG_DIR=/var/vcap/sys/log/${JOB_NAME}
 TMP_DIR=/var/vcap/sys/tmp/${JOB_NAME}
 
+# ubuntu jammy lib
+sudo apt-get install libtinfo5 -y
+
 function setup_environment() {
 
   for dir in ${RUN_DIR} ${LOG_DIR} ${TMP_DIR} 

jobs/postgres/spec

@@ -3,15 +3,12 @@ name: postgres
 templates:
   bin/pre-start.sh.erb: bin/pre-start
   bin/postgres_ctl.sh.erb: bin/postgres_ctl
-  bin/post-start.sh.erb: bin/post-start
   bin/monit_debugger: bin/monit_debugger
   data/postgresql.conf.erb: data/postgresql.conf
   data/pg_hba.conf: data/pg_hba.conf
   data/properties.sh: data/properties.sh
   helpers/ctl_setup.sh: helpers/ctl_setup.sh
   helpers/ctl_utils.sh: helpers/ctl_utils.sh
-  data/postgresql.sql.erb: data/postgresql.sql
-  data/postgresql-init.sh.erb: data/postgresql-init.sh
 packages:
   - postgres
 properties:

jobs/postgres/templates/bin/pre-start.sh.erb

@@ -16,6 +16,8 @@ PACKAGE_DATA_DIR=/var/vcap/data/packages/${PACKAGE_NAME}
 JOB_DATA_DIR=/var/vcap/data/jobs/${PACKAGE_NAME}
 JOB_DIR=/var/vcap/jobs/${PACKAGE_NAME}/data
 
+export PRODUCT_HOME=/var/vcap/packages/$PACKAGE_NAME
+
 function init_data_dir(){
   if [ ! -f "${DATA_DIR}/postgresql.conf" ]; then
     # initdb creates data directories
@@ -40,8 +42,6 @@ function main() {
   mkdir -p "${RUN_DIR}"
   chown -R vcap:vcap "${RUN_DIR}"
 
-  chmod 777 "${JOB_DIR}/postgresql-init.sh"
-  chmod 777 "${JOB_DIR}/postgresql.sql"
   sysctl -w "kernel.shmmax=284934144"
 }
 
@@ -58,8 +58,46 @@ log_statement=all
 log_min_duration_statement = 100 " >> /var/vcap/jobs/postgres/data/postgresql.conf
 
 sudo sed -i 's/      md5/      scram-sha-256/' /var/vcap/jobs/postgres/data/pg_hba.conf
-sudo sed -i 's/port = 5432/port = 5524/' /var/vcap/jobs/postgres/data/postgresql.conf
+sudo sed -i 's/port = 5432/port = <%= p('postgres.port') %>/' /var/vcap/jobs/postgres/data/postgresql.conf
 sudo chmod 600 /var/vcap/store/postgres/data/*.conf
 
+cp /var/vcap/jobs/postgres/data/postgresql.conf /var/vcap/store/postgres/data
+
 echo "##### SETUP :: APP-LIFECYCLE :: postgresql :: cce_enable END "
 <% end %>
+
+#LIFECYCLE DATE INPUT
+
+su - vcap -c "$PRODUCT_HOME/bin/pg_ctl -D $DATA_DIR start"
+
+TAIGA_DB_CHECK=$(sudo -u vcap /var/vcap/packages/postgres/bin/psql -p <%= p('postgres.port') %> -d postgres -c "\l" | grep "taiga" | cut -d '|' -f 1 | wc -l)
+
+if [ $TAIGA_DB_CHECK -eq 1 ]; then
+   sudo -u vcap /var/vcap/packages/postgres/bin/dropdb -p <%= p('postgres.port') %> taiga &> /dev/null
+fi
+
+
+sudo -u vcap /var/vcap/packages/postgres/bin/createdb -p <%= p('postgres.port') %> taiga &> /dev/null
+
+
+#CCE
+sudo -u vcap /var/vcap/packages/postgres/bin/psql -p <%= p('postgres.port') %> -d postgres -c "update pg_database set datallowconn = true where datname = 'template0'"
+
+sudo -u vcap /var/vcap/packages/postgres/bin/psql -p <%= p('postgres.port') %> -d postgres -c "show password_encryption"
+sudo -u vcap /var/vcap/packages/postgres/bin/psql -p <%= p('postgres.port') %> -d postgres -c "select usename, passwd from pg_shadow"
+sudo -u vcap /var/vcap/packages/postgres/bin/psql -p <%= p('postgres.port') %> -d postgres -c "alter user vcap with password '<%= p('service.init_password') %>'"
+sudo -u vcap /var/vcap/packages/postgres/bin/psql -p <%= p('postgres.port') %> -d postgres -c "select usename, passwd from pg_shadow"
+
+sudo -u vcap /var/vcap/packages/postgres/bin/psql -p <%= p('postgres.port') %> -d postgres -c "\l"
+sudo -u vcap /var/vcap/packages/postgres/bin/psql -p <%= p('postgres.port') %> -d postgres -c "\dn+"
+
+sudo -u vcap /var/vcap/packages/postgres/bin/psql -p <%= p('postgres.port') %> -d postgres -c "REVOKE ALL ON SCHEMA public FROM PUBLIC"
+sudo -u vcap /var/vcap/packages/postgres/bin/psql -p <%= p('postgres.port') %> -d taiga -c "REVOKE ALL ON SCHEMA public FROM PUBLIC"
+sudo -u vcap /var/vcap/packages/postgres/bin/psql -p <%= p('postgres.port') %> -d template0 -c "REVOKE ALL ON SCHEMA public FROM PUBLIC"
+sudo -u vcap /var/vcap/packages/postgres/bin/psql -p <%= p('postgres.port') %> -d template1 -c "REVOKE ALL ON SCHEMA public FROM PUBLIC"
+
+sudo -u vcap /var/vcap/packages/postgres/bin/psql -p <%= p('postgres.port') %> -d postgres -c "\l"
+sudo -u vcap /var/vcap/packages/postgres/bin/psql -p <%= p('postgres.port') %> -d postgres -c "\dn+"
+
+
+su - vcap -c "$PRODUCT_HOME/bin/pg_ctl -D $DATA_DIR stop"