slapos-node: remove dead code and duplicate conf

slapos.cfg example is maintained in slapos.core and available at /opt/slapos/eggs/slapos.core-*.egg/slapos/slapos.cfg.example

slapos-node: remove dead code and duplicate conf
slapos.cfg example is maintained in slapos.core and available at /opt/slapos/eggs/slapos.core-*.egg/slapos/slapos.cfg.example
354e3593 · Julien Muchembled · 03a34149 · 03a34149 · 354e3593 · 354e3593
Commit 354e3593 authored Dec 02, 2021 by Julien Muchembled
6 changed files
--- a/obs/slapos/debian/examples
+++ b/obs/slapos/debian/examples
-debian/slapos.cfg
--- a/obs/slapos/debian/postinst
+++ b/obs/slapos/debian/postinst
 #!/bin/sh
-
-
 set -e

-
 mkdir -p /etc/opt/slapos/ssl/partition_pki
 mkdir -p /opt/slapos/log

-
-
-
-
-##DEBHELPER#
-#. /usr/share/debconf/confmodule
-#
-#
-#
-## If user don't want to, it will go throw normal setup
-#if [ -f  /etc/opt/slapos/shell_conf ]; then
-#    
-#    rm -f /etc/opt/slapos/shell_conf
-#    CONFIG_FILE=/etc/opt/slapos/slapos.cfg
-#
-#    if [ ! -f "$CONFIG_FILE" ]; then
-#	NEW_CONFIG_FILE=$CONFIG_FILE
-#    else
-#	NEW_CONFIG_FILE=/etc/opt/slapos/slapos.cfg.dpkg-new
-#    fi
-#
-#    echo "# Never edit this file by hand as it has been automatically generated by
-## debconf. You can change the settings at any time by running:
-## ``dpkg-reconfigure -pmedium slapos-node''" > $NEW_CONFIG_FILE
-#
-#    cat < /usr/share/doc/slapos-node/examples/slapos.cfg >> $NEW_CONFIG_FILE
-#
-#    db_get slapos-node/master_url
-#    MASTER_URL="$RET"
-#    WITH_HTTPS=$(echo "$MASTER_URL" | grep -q "^https://" && echo true || echo false)
-#
-#    db_get slapos-node/computer_id
-#    COMPUTER_ID="$RET"
-#
-#    sed -e "s#^\s*master_url\s*=.*#master_url = $MASTER_URL#" \
-#	-e "s#^\s*computer_id\s*=.*#computer_id = $COMPUTER_ID#" \
-#	-i $NEW_CONFIG_FILE
-#
-## Handle HTTPS URLs by just commenting/uncommenting the relevant lines
-#    if $WITH_HTTPS; then
-#	sed -i 's/^\s*#\+\s*\(key_file\|cert_file\|certificate_repository_path\)/\1/' \
-#	    $NEW_CONFIG_FILE
-#
-#    # Renamed files
-#	test -f /etc/opt/slapos/ssl/slapos.crt && \
-#            mv /etc/opt/slapos/ssl/slapos.crt /etc/opt/slapos/ssl/computer.crt
-#	test -f /etc/opt/slapos/ssl/slapos.key && \
-#            mv /etc/opt/slapos/ssl/slapos.key /etc/opt/slapos/ssl/computer.key
-#    else
-#	sed -i 's/^\s*[^#]*\s*\(key_file\|cert_file\|certificate_repository_path\)/#\1/' \
-#	    $NEW_CONFIG_FILE
-#    fi
-#
-#    db_get slapos-node/partition_amount
-#    PARTITION_AMOUNT="$RET"
-#
-#    db_get slapos-node/ipv4_local_network
-#    IPV4_LOCAL_NETWORK="$RET"
-#
-#    sed -e "s#^\s*partition_amount\s*=.*#partition_amount = $PARTITION_AMOUNT#" \
-#	-e "s#^\s*ipv4_local_network\s*=.*#ipv4_local_network = $IPV4_LOCAL_NETWORK#" \
-#	-i $NEW_CONFIG_FILE
-#
-#    if [ "$CONFIG_FILE" != "$NEW_CONFIG_FILE" ]; then
-#	ucfr slapos-node $CONFIG_FILE
-#	ucf --debconf-ok --three-way $NEW_CONFIG_FILE $CONFIG_FILE
-#	rm -f $NEW_CONFIG_FILE
-#    fi
-#
-#fi
-
-exit 0
+#DEBHELPER#
--- a/obs/slapos/debian/postrm
+++ b/obs/slapos/debian/postrm
@@ -18,5 +18,3 @@ case "$1" in
 esac

 #DEBHELPER#
-
-exit 0
--- a/obs/slapos/debian/preinst
+++ b/obs/slapos/debian/preinst
@@ -11,5 +11,3 @@ if [ -f /etc/openvpn/vifib.conf ]; then
 fi

 #DEBHELPER#
-
-exit 0
--- a/obs/slapos/debian/prerm
+++ b/obs/slapos/debian/prerm
@@ -20,5 +20,3 @@ if [ -f /etc/openvpn/vifib.conf ]; then
 fi

 #DEBHELPER#
-
-exit 0
--- a/obs/slapos/debian/slapos.cfg
+++ b/obs/slapos/debian/slapos.cfg
-[slapos]
-software_root = /opt/slapgrid
-instance_root = /srv/slapgrid
-master_url = https://slap.vifib.com/
-# Replace computer_id by the unique identifier of your computer on vifib.net,
-# starting by COMP-
-computer_id = COMP-12345
-key_file = /etc/opt/slapos/ssl/computer.key
-cert_file =  /etc/opt/slapos/ssl/computer.crt
-certificate_repository_path = /etc/opt/slapos/ssl/partition_pki
-
-[slapformat]
-# Replace by your network interface like eth0, eth1, slapbr0...
-interface_name = interfacename
-create_tap = false
-partition_amount = 10
-computer_xml = /opt/slapos/slapos.xml
-log_file = /opt/slapos/slapformat.log
-partition_base_name = slappart
-user_base_name = slapuser
-tap_base_name = slaptap
-# You can choose any other local network which does not conflict with your
-# current machine configuration
-ipv4_local_network = 10.0.0.0/16
-# Uncomment and change this if you are using an IPv6 tunnel (like VPN, gogoc,
-# tunnelbroker.net)
-# ipv6_interface = tapVPN
-
-
-[networkcache]
-# Define options for binary cache, used to download already compiled software.
-download-binary-cache-url = http://www.shacache.org/shacache
-download-cache-url = https://www.shacache.org/shacache
-download-binary-dir-url = http://www.shacache.org/shadir
-# List of signatures of uploaders we trust:
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-# List of URL(s) which shouldn't be installed from binary cache, separated by
-# commas. Any URL beginning by a blacklisted URL will be blacklisted as well.
-binary-cache-url-blacklist =
-  http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD
-  http://git.erp5.org/gitweb/slapos.core.git/blob_plain/refs/heads
-