Skip to content

Commit e54ff92

Browse files
committed
Run deploy from not privileged user.
1 parent a30e404 commit e54ff92

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

Vagrantfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Vagrant.configure(2) do |config|
22
config.vm.box = "hashicorp/precise32"
33

4-
config.vm.provision "shell", path: "scripts/deploy.sh"
4+
config.vm.provision "shell" do |s|
5+
s.path = "scripts/deploy.sh"
6+
s.privileged = false
7+
s.keep_color = true
8+
end
59
end

scripts/deploy.sh

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
#!/bin/bash -e
22

3-
HOST_USER=vagrant
4-
HOST_HOME=/home/$HOST_USER
5-
TRAMP_USER=test
6-
TRAMP_HOME=/home/$TRAMP_USER
3+
PROJECT_ROOT=/vagrant
74

85
# Create tramp user.
96

10-
adduser --quiet $TRAMP_USER
7+
TRAMP_USER=test
8+
TRAMP_HOME=/home/$TRAMP_USER
9+
10+
sudo adduser --quiet $TRAMP_USER
1111

1212
# Register tramp host.
1313

14-
sudo -u $HOST_USER ssh-keygen -t rsa -b 4096 -f $HOST_HOME/.ssh/id_rsa -N ''
15-
sudo -u $HOST_USER touch $HOST_HOME/.ssh/known_hosts
16-
sudo -u $HOST_USER ssh-keygen -R localhost
17-
sudo -u $HOST_USER ssh-keyscan -H localhost > $HOST_HOME/.ssh/known_hosts
14+
ssh-keygen -t rsa -b 4096 -f $HOME/.ssh/id_rsa -N ''
15+
touch $HOME/.ssh/known_hosts
16+
ssh-keygen -R localhost
17+
ssh-keyscan -H localhost > $HOME/.ssh/known_hosts
1818

1919
# Authorize localhost for tramp user.
2020

2121
sudo -u $TRAMP_USER mkdir -p $TRAMP_HOME/.ssh
22-
sudo -u $HOST_USER cat $HOST_HOME/.ssh/id_rsa.pub | sudo -u $TRAMP_USER cat > $TRAMP_HOME/.ssh/authorized_keys
22+
sudo -u $TRAMP_USER sh -c "echo '$(cat $HOME/.ssh/id_rsa.pub)' > $TRAMP_HOME/.ssh/authorized_keys"
2323

2424
# Update mirrors list.
2525

26-
apt-get update
26+
sudo apt-get update
2727

2828
# Install Emacs build dependencies.
2929

30-
apt-get install -y libncurses-dev libxpm-dev libxaw7-dev \
31-
libtiff4-dev libpng-dev libgif-dev autoconf \
32-
automake texinfo make
30+
sudo apt-get install -y libncurses-dev libxpm-dev libxaw7-dev \
31+
libtiff4-dev libpng-dev libgif-dev autoconf \
32+
automake texinfo make
3333

3434
# Build Emacs.
3535

36-
EMACS_DIR=/usr/local/emacs
36+
EMACS_DIR=$HOME/.emacs
3737
EMACS_SRC=$EMACS_DIR/src
3838
EMACS_VERSIONS=(emacs-24.3 emacs-24.4 emacs-24.5)
3939

0 commit comments

Comments
 (0)