From 1834b17c5ccf62a5d5d73376cef0cfd8ddcefdb7 Mon Sep 17 00:00:00 2001 From: rublon-jfr <115086620+rublon-jfr@users.noreply.github.com> Date: Wed, 11 Oct 2023 19:36:49 +0200 Subject: [PATCH] Add default rublon.config, add missing 'git' prerequirement (#4) --- os/centos/stream9/Vagrantfile | 12 +++++---- os/debian/11/Vagrantfile | 47 ++++++++++++++++++--------------- os/debian/12/Vagrantfile | 46 +++++++++++++++++--------------- os/ubuntu/20.04/Vagrantfile | 47 ++++++++++++++++++--------------- os/ubuntu/22.04/Vagrantfile | 49 +++++++++++++++++++---------------- rsc/rublon.config.defaults | 10 +++++++ 6 files changed, 121 insertions(+), 90 deletions(-) create mode 100644 rsc/rublon.config.defaults diff --git a/os/centos/stream9/Vagrantfile b/os/centos/stream9/Vagrantfile index 4285ffe..bec545f 100755 --- a/os/centos/stream9/Vagrantfile +++ b/os/centos/stream9/Vagrantfile @@ -36,13 +36,17 @@ Vagrant.configure("2") do |config| config.vm.provision "shell", inline: <<-SHELL yum update - yum install -y gcc openssl-devel curl-devel pam-devel rapidjson-devel cmake + yum install -y gcc openssl-devel curl-devel pam-devel git rapidjson-devel cmake - # Building project + # Build project cd /home/vagrant/Rublon-Linux cmake -B build && cmake --build build + + # Install sudo cmake --install build - + sudo install -m 644 rsc/rublon.config.defaults /etc/rublon.config + + # Register Rublon pam sed -i 's/UsePAM .*/UsePAM yes/' /etc/ssh/sshd_config sed -i 's/ChallengeResponseAuthentication .*/ChallengeResponseAuthentication yes/' /etc/ssh/sshd_config grep -q -e 'auth required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aauth required pam_rublon.so' /etc/pam.d/sshd @@ -50,7 +54,5 @@ Vagrant.configure("2") do |config| systemctl restart sshd.service SHELL - - end diff --git a/os/debian/11/Vagrantfile b/os/debian/11/Vagrantfile index c9d603d..cf61e67 100755 --- a/os/debian/11/Vagrantfile +++ b/os/debian/11/Vagrantfile @@ -35,27 +35,32 @@ Vagrant.configure("2") do |config| # documentation for more information about their specific syntax and use. config.vm.provision "shell", inline: <<-SHELL - DEBIAN_FRONTEND=noniteracactive\ - apt-get update && apt-get install -y \ - gcc \ - build-essential \ - openssh-server \ - libcurl4-openssl-dev \ - libpam0g-dev \ - libssl-dev \ - rapidjson-dev \ - cmake + DEBIAN_FRONTEND=noniteracactive\ + apt-get update && apt-get install -y \ + gcc \ + build-essential \ + openssh-server \ + libcurl4-openssl-dev \ + libpam0g-dev \ + libssl-dev \ + git \ + rapidjson-dev \ + cmake - # Building project - cd /home/vagrant/Rublon-Linux - cmake -B build && cmake --build build - sudo cmake --install build - - sed -i 's/UsePAM .*/UsePAM yes/' /etc/ssh/sshd_config - sed -i 's/ChallengeResponseAuthentication .*/ChallengeResponseAuthentication yes/' /etc/ssh/sshd_config - grep -q -e 'auth required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aauth required pam_rublon.so' /etc/pam.d/sshd - grep -q -e 'account required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aaccount required pam_rublon.so' /etc/pam.d/sshd + # Build project + cd /home/vagrant/Rublon-Linux + cmake -B build && cmake --build build - service sshd restart - SHELL + # Install + sudo cmake --install build + sudo install -m 644 rsc/rublon.config.defaults /etc/rublon.config + + # Register Rublon pam + sed -i 's/UsePAM .*/UsePAM yes/' /etc/ssh/sshd_config + sed -i 's/ChallengeResponseAuthentication .*/ChallengeResponseAuthentication yes/' /etc/ssh/sshd_config + grep -q -e 'auth required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aauth required pam_rublon.so' /etc/pam.d/sshd + grep -q -e 'account required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aaccount required pam_rublon.so' /etc/pam.d/sshd + + service sshd restart + SHELL end diff --git a/os/debian/12/Vagrantfile b/os/debian/12/Vagrantfile index 863d641..d6d9a3f 100755 --- a/os/debian/12/Vagrantfile +++ b/os/debian/12/Vagrantfile @@ -35,27 +35,31 @@ Vagrant.configure("2") do |config| # documentation for more information about their specific syntax and use. config.vm.provision "shell", inline: <<-SHELL - DEBIAN_FRONTEND=noniteracactive\ - apt-get update && apt-get install -y \ - gcc \ - build-essential \ - openssh-server \ - libcurl4-openssl-dev \ - libpam0g-dev \ - libssl-dev \ - rapidjson-dev \ - cmake + DEBIAN_FRONTEND=noniteracactive\ + apt-get update && apt-get install -y \ + gcc \ + build-essential \ + openssh-server \ + libcurl4-openssl-dev \ + libpam0g-dev \ + libssl-dev \ + git \ + rapidjson-dev \ + cmake - # Building project - cd /home/vagrant/Rublon-Linux - cmake -B build && cmake --build build - sudo cmake --install build - - sed -i 's/UsePAM .*/UsePAM yes/' /etc/ssh/sshd_config - sed -i 's/ChallengeResponseAuthentication .*/ChallengeResponseAuthentication yes/' /etc/ssh/sshd_config - grep -q -e 'auth required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aauth required pam_rublon.so' /etc/pam.d/sshd - grep -q -e 'account required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aaccount required pam_rublon.so' /etc/pam.d/sshd + # Build project + cd /home/vagrant/Rublon-Linux + cmake -B build && cmake --build build - service sshd restart - SHELL + # Install + sudo cmake --install build + sudo install -m 644 rsc/rublon.config.defaults /etc/rublon.config + + # Register Rublon pam + sed -i 's/UsePAM .*/UsePAM yes/' /etc/ssh/sshd_config + sed -i 's/ChallengeResponseAuthentication .*/ChallengeResponseAuthentication yes/' /etc/ssh/sshd_config + grep -q -e 'auth required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aauth required pam_rublon.so' /etc/pam.d/sshd + grep -q -e 'account required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aaccount required pam_rublon.so' /etc/pam.d/sshd + + service sshd restart end diff --git a/os/ubuntu/20.04/Vagrantfile b/os/ubuntu/20.04/Vagrantfile index ece2ef7..4e7468a 100755 --- a/os/ubuntu/20.04/Vagrantfile +++ b/os/ubuntu/20.04/Vagrantfile @@ -35,27 +35,32 @@ Vagrant.configure("2") do |config| # documentation for more information about their specific syntax and use. config.vm.provision "shell", inline: <<-SHELL - DEBIAN_FRONTEND=noniteracactive\ - apt-get update && apt-get install -y \ - gcc \ - build-essential \ - openssh-server \ - libcurl4-openssl-dev \ - libpam0g-dev \ - libssl-dev \ - rapidjson-dev \ - cmake + DEBIAN_FRONTEND=noniteracactive\ + apt-get update && apt-get install -y \ + gcc \ + build-essential \ + openssh-server \ + libcurl4-openssl-dev \ + libpam0g-dev \ + libssl-dev \ + git \ + rapidjson-dev \ + cmake - # Building project - cd /home/vagrant/Rublon-Linux - cmake -B build && cmake --build build - sudo cmake --install build - - sed -i 's/UsePAM .*/UsePAM yes/' /etc/ssh/sshd_config - sed -i 's/ChallengeResponseAuthentication .*/ChallengeResponseAuthentication yes/' /etc/ssh/sshd_config - grep -q -e 'auth required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aauth required pam_rublon.so' /etc/pam.d/sshd - grep -q -e 'account required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aaccount required pam_rublon.so' /etc/pam.d/sshd + # Build project + cd /home/vagrant/Rublon-Linux + cmake -B build && cmake --build build - service sshd restart - SHELL + # Install + sudo cmake --install build + sudo install -m 644 rsc/rublon.config.defaults /etc/rublon.config + + # Register Rublon pam + sed -i 's/UsePAM .*/UsePAM yes/' /etc/ssh/sshd_config + sed -i 's/ChallengeResponseAuthentication .*/ChallengeResponseAuthentication yes/' /etc/ssh/sshd_config + grep -q -e 'auth required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aauth required pam_rublon.so' /etc/pam.d/sshd + grep -q -e 'account required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aaccount required pam_rublon.so' /etc/pam.d/sshd + + service sshd restart + SHELL end diff --git a/os/ubuntu/22.04/Vagrantfile b/os/ubuntu/22.04/Vagrantfile index b652849..9df6bfb 100755 --- a/os/ubuntu/22.04/Vagrantfile +++ b/os/ubuntu/22.04/Vagrantfile @@ -34,28 +34,33 @@ Vagrant.configure("2") do |config| # Ansible, Chef, Docker, Puppet and Salt are also available. Please see the # documentation for more information about their specific syntax and use. config.vm.provision "shell", inline: <<-SHELL - - DEBIAN_FRONTEND=noniteracactive\ - apt-get update && apt-get install -y \ - gcc \ - build-essential \ - openssh-server \ - libcurl4-openssl-dev \ - libpam0g-dev \ - libssl-dev \ - rapidjson-dev \ - cmake - # Building project - cd /home/vagrant/Rublon-Linux - cmake -B build && cmake --build build - sudo cmake --install build - - sed -i 's/UsePAM .*/UsePAM yes/' /etc/ssh/sshd_config - sed -i 's/ChallengeResponseAuthentication .*/ChallengeResponseAuthentication yes/' /etc/ssh/sshd_config - grep -q -e 'auth required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aauth required pam_rublon.so' /etc/pam.d/sshd - grep -q -e 'account required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aaccount required pam_rublon.so' /etc/pam.d/sshd + DEBIAN_FRONTEND=noniteracactive\ + apt-get update && apt-get install -y \ + gcc \ + build-essential \ + openssh-server \ + libcurl4-openssl-dev \ + libpam0g-dev \ + libssl-dev \ + git \ + rapidjson-dev \ + cmake - service sshd restart - SHELL + # Build project + cd /home/vagrant/Rublon-Linux + cmake -B build && cmake --build build + + # Install + sudo cmake --install build + sudo install -m 644 rsc/rublon.config.defaults /etc/rublon.config + + # Register Rublon pam + sed -i 's/UsePAM .*/UsePAM yes/' /etc/ssh/sshd_config + sed -i 's/ChallengeResponseAuthentication .*/ChallengeResponseAuthentication yes/' /etc/ssh/sshd_config + grep -q -e 'auth required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aauth required pam_rublon.so' /etc/pam.d/sshd + grep -q -e 'account required pam_rublon.so' /etc/pam.d/sshd || sed -i '\$aaccount required pam_rublon.so' /etc/pam.d/sshd + + service sshd restart + SHELL end diff --git a/rsc/rublon.config.defaults b/rsc/rublon.config.defaults new file mode 100644 index 0000000..b269719 --- /dev/null +++ b/rsc/rublon.config.defaults @@ -0,0 +1,10 @@ +systemToken= +secretKey= +userDomain= +rublonApiServer=https://core.rublon.net +failMode=bypass +offlineBypass=true +prompt=1 +logging=true +enablePasswdEmail=true +autopushPrompt=false