Fix merge conflicts

CHANGELOG.md

@@ -1,9 +1,27 @@
 cookbook-chef-server CHANGELOG
 ===============
 
+## 1.0.9
+
+  - Miguel Negrón
+    - [c52ca68] Add pre and postun to clean the cookbook
+    - [6628610] Normalize code
+    - [35bf776] Bump version
+    - [efe65ea] Give correct permissions to crt file
+    - [5bd1cef] Add permissions for private-chef-secrets.json
+    - [04a83e9] Add permissions for private-chef-secrets.json
+    - [d52719b] Add accept license
+  - Miguel Negrón
+    - [6628610] Normalize code
+    - [35bf776] Bump version
+    - [efe65ea] Give correct permissions to crt file
+    - [5bd1cef] Add permissions for private-chef-secrets.json
+    - [04a83e9] Add permissions for private-chef-secrets.json
+    - [d52719b] Add accept license
+
 ## 1.0.8
 
-  - Miguel Negron
+  - Miguel Negrón
     - [efe65ea] Give correct permissions to crt file
     - [5bd1cef] Add permissions for private-chef-secrets.json
     - [04a83e9] Add permissions for private-chef-secrets.json
@@ -12,7 +30,7 @@ cookbook-chef-server CHANGELOG
 ## 1.0.7
 
 
-  - Miguel Negron
+  - Miguel Negrón
     - [7602d84] lint resources
     - [a56d9d7] lint recipes
     - [4fc36e0] lint providers

packaging/rpm/cookbook-chef-server.spec

@@ -23,6 +23,9 @@ chmod -R 0755 %{buildroot}/var/chef/cookbooks/chef-server
 install -D -m 0644 README.md %{buildroot}/var/chef/cookbooks/chef-server/README.md
 
 %pre
+if [ -d /var/chef/cookbooks/chef-server ]; then
+    rm -rf /var/chef/cookbooks/chef-server
+fi
 
 %post
 case "$1" in
@@ -36,6 +39,12 @@ case "$1" in
   ;;
 esac
 
+%postun
+# Deletes directory when uninstall the package
+if [ "$1" = 0 ] && [ -d /var/chef/cookbooks/chef-server ]; then
+  rm -rf /var/chef/cookbooks/chef-server
+fi
+
 %files
 %defattr(0755,root,root)
 /var/chef/cookbooks/chef-server
@@ -45,9 +54,14 @@ esac
 %doc
 
 %changelog
-* Fri Dec 01 2023 Miguel Negrón <[email protected]> - 1.0.6-1
+* Thu Oct 10 2024 Miguel Negrón <[email protected]>
+- Add pre and postun
+
+* Fri Dec 01 2023 Miguel Negrón <[email protected]>
 - Add sync ip suppport
-* Fri Jan 07 2022 David Vanhoucke <[email protected]> - 1.0.1-1
+
+* Fri Jan 07 2022 David Vanhoucke <[email protected]>
 - change register to consul
-* Tue Oct 18 2016 Alberto Rodríguez <[email protected]> - 1.0.0-1
+
+* Tue Oct 18 2016 Alberto Rodríguez <[email protected]>
 - first spec version

resources/metadata.rb

@@ -3,4 +3,4 @@
 maintainer_email '[email protected]'
 license          'AGPL-3.0'
 description      'Installs/Configures chef-server'
-version          '1.0.8'
+version          '1.0.9'