kdbox: update, use good name and variable

playbook/kdbox-playbook.yml

@@ -38,7 +38,7 @@
       private: no
       default: "notoken"
 
-    - name : "Token"
+    - name: "Token"
       prompt: "What is your credential account token"
       private: no 
       default: "notoken"
@@ -46,7 +46,7 @@
     - name: "domain_name"
       prompt: "Enter domain name for CDN main instance"
       private: no
-      default: ""
+      default: "kdbox.slapos-example.com"
 
     - name: "custom_domain"
       prompt: "Enter custom domain name for CDN slave instance"

playbook/roles/kdbox/files/challenge

 #!/bin/bash
 
-pwd=$2
 domain=$1
+CODE=$(curl -s -n -k -L -o /dev/null -w "%{http_code}" "https://$domain/.well-known/manage_main")
 
-curl -X POST -d "id=.well-known&submit=Add" http://zope:$pwd@$domain/portal_skins/custom/manage_addProduct/OFSP/manage_addFolder
-code=$?
-
-if [ "$code" == 0 ]; then
-  touch /opt/kdbox/dehydrated/well-know-done
+if [ "$CODE" == "200" ]; then
+  echo "Code=$CODE, .well-know exists already!"
+  exit 0
+else
+  curl -k -L -n -X POST -d "id=.well-known&submit=Add" http://$domain/portal_skins/custom/manage_addProduct/OFSP/manage_addFolder
 fi
-exit $code

playbook/roles/kdbox/files/kdbox-state

-#!/bin/bash
-
-

playbook/roles/kdbox/tasks/dehydrated.yml

@@ -35,12 +35,9 @@
         login zope
         password {{ erp5_pwd.stdout }} 
 
-  - stat: path=/opt/kdbox/dehydrated/well-know-done
-    register: well_know_done
-
   - name: Create .well-know folder on erp5 site
-    shell: "{{ role_path }}/files/challenge {{ custom_domain}} {{ erp5_pwd.stdout }}"
-    when: well_know_done.stat.exists == False
+    shell: "{{ role_path }}/files/challenge {{ custom_domain}}"
+    register: well_know
 
   - stat: path="/opt/kdbox/dehydrated/certs/{{ custom_domain }}"
     register: cert_folder

playbook/roles/kdbox/tasks/deploy.yml

@@ -3,14 +3,25 @@
   - stat: path=/opt/slapos.playbook/
     register: playbook_folder
 
+  # temp part to use playbook from branch
   - name: Download playbook
     shell: git clone https://lab.nexedi.com/nexedi/slapos.package.git /tmp/kdbox-playbook
     when: playbook_folder.stat.exists == False
 
+  - shell: cd /tmp/kdbox-playbook/; git checkout alain-kdbox
+    when: playbook_folder.stat.exists == False
+
   - name: Copy slapos.playbook
     shell: cp -ax /tmp/kdbox-playbook/playbook /opt/slapos.playbook/
     when: playbook_folder.stat.exists == False
 
+  # part to use
+  #- name: Download the playbook 
+  #  shell: slapcache-download --destination=/opt/kdbox/archive.tar.gz
+
+  #- name: Copy slapos.playbook
+  #  unarchive: src=/opt/kdbox/archive.tar.gz dest=/opt/slapos.playbook
+
   - stat: path=/usr/local/bin/kdbox-deploy
     register: bin_file
 
@@ -27,12 +38,14 @@
 
   - name: Start deploy cron
     cron: job="bash -lc /usr/local/bin/kdbox-deploy >> /var/log/kdbox.log 2>&1"
-          cron_file=ansible-kdbox-deploy user="root"
+          cron_file=ansible-kdbox-deploy
+          user="root"
           name="Start kdbox deploy"
           minute="*/1"
 
   - name: Remove cron task
     cron: name="Start kdbox deploy"
+          cron_file=ansible-kdbox-deploy
           job="echo 1"
           state=absent
     when: kdbox_ok == True

playbook/settings/kdbox.yml

-frontend_software_release_url: https://lab.node.vifib.com/nexedi/slapos/raw/1.0.82/software/caddy-frontend/software.cfg
-frontend_slave_backend_url: https://[2401:5180:0:38::7377]:2152
-#recupuration de frontend_slave_backend_url à automatiser
+frontend_software_release_url: https://lab.node.vifib.com/nexedi/slapos/raw/1.0.95.2/software/caddy-frontend/software.cfg
 re6st_annon: False
 #variable crée pour desactiver le RADVD 
 enable_router_advertisement: False
 re6st_fingerprint: sha256:499a44702d687e968c047d28e33f59e5c3bae71a38619dc730152a3557c20301
 re6st_registry_url: http://re6stnet.gnet.erp5.cn/
-webrunner_software_release_url: https://lab.node.vifib.com/nexedi/slapos/raw/1.0.75/software/slaprunner/software.cfg
-frontend_instance_name: FRONTEND-kdboxtest
-webrunner_instance_name: webrunner-1
-frontend_instance_slave_name : KDBox-
-
+webrunner_software_release_url: https://lab.node.vifib.com/nexedi/slapos/raw/1.0.97/software/slaprunner/software.cfg
+frontend_instance_name: kdbox-main-FRONTEND
+webrunner_instance_name: kdbox-resilient-webrunner

[Jérome Perrin]

( just saw this accidentally in my RSS ... why not use https://lab.nexedi.com/nexedi/dehydrated-zope-hook ? )

[Alain Takoudjou]

zope-hook is used, this part is to create the folder .well-known in erp5 portal_skin before launch dehydrated.

[Jérome Perrin]

Oh thanks for explanation, I did not read the full patch ... that's perfect then :)

[Rafael Monnerat]

This part of create the folder could be merged into dehydrated zope-hook probably.

[Jérome Perrin]

That was also my first reaction, but then I thought it might be intentional. .well-known is not only a letsencrypt thing ( https://tools.ietf.org/html/rfc5785 ) , so to be sure not to conflict with some future usages that we don't know yet, zope-hook maybe intentionally does not take this decision to create .well-known in custom skin folder.

/cc @kazuhiko

[Kazuhiko Shiozaki]

If .well-known Folder does not yet exist, we don't need to hesitate to create it, do we ?

[Alain Takoudjou]

I think we do not

[Jérome Perrin]

I thought there was a reason not to do it, but I also believe this is something dehydrated-zope-hook could do