Browse Source

Upate client to enable Parabola/Arch users

Bob Mottram 8 years ago
parent
commit
1538234bf1
1 changed files with 48 additions and 8 deletions
  1. 48
    8
      src/freedombone-client

+ 48
- 8
src/freedombone-client View File

58
 REFRESH_GPG_KEYS_HOURS=2
58
 REFRESH_GPG_KEYS_HOURS=2
59
 
59
 
60
 function global_rate_limit {
60
 function global_rate_limit {
61
-    sudo cp /etc/sysctl.conf ~/sysctl.conf
61
+    SYSCTL_FILE=/etc/sysctl.conf
62
+    if [ -f /usr/bin/pacman ]; then
63
+        SYSCTL_FILE=/etc/sysctl.d/99-sysctl.conf
64
+    fi
65
+    if [ ! -f $SYSCTL_FILE ]; then
66
+        sudo touch $SYSCTL_FILE
67
+    fi
68
+
69
+    sudo cp $SYSCTL_FILE ~/sysctl.conf
70
+    if [ ! -f /usr/bin/pacman ]; then
71
+        sudo chown $CURR_USER:$CURR_USER ~/sysctl.conf
72
+    else
73
+        sudo chown $CURR_USER:users ~/sysctl.conf
74
+    fi
62
     if ! grep -q "tcp_challenge_ack_limit" ~/sysctl.conf; then
75
     if ! grep -q "tcp_challenge_ack_limit" ~/sysctl.conf; then
63
         echo 'net.ipv4.tcp_challenge_ack_limit = 999999999' >> ~/sysctl.conf
76
         echo 'net.ipv4.tcp_challenge_ack_limit = 999999999' >> ~/sysctl.conf
64
     else
77
     else
65
         sed -i 's|net.ipv4.tcp_challenge_ack_limit.*|net.ipv4.tcp_challenge_ack_limit = 999999999|g' ~/sysctl.conf
78
         sed -i 's|net.ipv4.tcp_challenge_ack_limit.*|net.ipv4.tcp_challenge_ack_limit = 999999999|g' ~/sysctl.conf
66
     fi
79
     fi
67
-    sudo cp ~/sysctl.conf /etc/sysctl.conf
80
+    sudo cp ~/sysctl.conf $SYSCTL_FILE
68
     sudo rm ~/sysctl.conf
81
     sudo rm ~/sysctl.conf
69
     sudo sysctl -p
82
     sudo sysctl -p
70
 }
83
 }
71
 
84
 
72
 function refresh_gpg_keys {
85
 function refresh_gpg_keys {
73
     if [ ! -f /usr/bin/gpg ]; then
86
     if [ ! -f /usr/bin/gpg ]; then
74
-        sudo apt-get -y install gnupg
87
+        if [ ! -f /usr/bin/pacman ]; then
88
+            sudo apt-get -y install gnupg
89
+        else
90
+            sudo pacman -S --noconfirm gnupg
91
+        fi
75
     fi
92
     fi
76
     sudo cp /etc/crontab ~/temp_crontab
93
     sudo cp /etc/crontab ~/temp_crontab
77
-    sudo chown $CURR_USER:$CURR_USER ~/temp_crontab
94
+    if [ ! -f /usr/bin/pacman ]; then
95
+        sudo chown $CURR_USER:$CURR_USER ~/temp_crontab
96
+    else
97
+        sudo chown $CURR_USER:users ~/temp_crontab
98
+    fi
78
     if ! grep -q "gpg --refresh-keys" ~/temp_crontab; then
99
     if ! grep -q "gpg --refresh-keys" ~/temp_crontab; then
79
         echo "0            */$REFRESH_GPG_KEYS_HOURS *   *   *   $CURR_USER /usr/bin/gpg --refresh-keys > /dev/null" >> ~/temp_crontab
100
         echo "0            */$REFRESH_GPG_KEYS_HOURS *   *   *   $CURR_USER /usr/bin/gpg --refresh-keys > /dev/null" >> ~/temp_crontab
80
         sudo cp ~/temp_crontab /etc/crontab
101
         sudo cp ~/temp_crontab /etc/crontab
97
     sudo sed -i "s/#   MACs.*/   MACs $SSH_MACS/g" /etc/ssh/ssh_config
118
     sudo sed -i "s/#   MACs.*/   MACs $SSH_MACS/g" /etc/ssh/ssh_config
98
     if ! grep -q "HostKeyAlgorithms" /etc/ssh/ssh_config; then
119
     if ! grep -q "HostKeyAlgorithms" /etc/ssh/ssh_config; then
99
         sudo cp /etc/ssh/ssh_config ~/ssh_config
120
         sudo cp /etc/ssh/ssh_config ~/ssh_config
100
-        sudo chown $CURR_USER:$CURR_USER ~/ssh_config
121
+        if [ ! -f /usr/bin/pacman ]; then
122
+            sudo chown $CURR_USER:$CURR_USER ~/ssh_config
123
+        else
124
+            sudo chown $CURR_USER:users ~/ssh_config
125
+        fi
101
         echo "   HostKeyAlgorithms $SSH_HOST_KEY_ALGORITHMS" >> ~/ssh_config
126
         echo "   HostKeyAlgorithms $SSH_HOST_KEY_ALGORITHMS" >> ~/ssh_config
102
         sudo mv ~/ssh_config /etc/ssh/ssh_config
127
         sudo mv ~/ssh_config /etc/ssh/ssh_config
103
         sudo chown root:root /etc/ssh/ssh_config
128
         sudo chown root:root /etc/ssh/ssh_config
105
     sudo sed -i "s/Ciphers.*/Ciphers $SSH_CIPHERS/g" /etc/ssh/ssh_config
130
     sudo sed -i "s/Ciphers.*/Ciphers $SSH_CIPHERS/g" /etc/ssh/ssh_config
106
     if ! grep -q "Ciphers " /etc/ssh/ssh_config; then
131
     if ! grep -q "Ciphers " /etc/ssh/ssh_config; then
107
         sudo cp /etc/ssh/ssh_config ~/ssh_config
132
         sudo cp /etc/ssh/ssh_config ~/ssh_config
108
-        sudo chown $CURR_USER:$CURR_USER ~/ssh_config
133
+        if [ ! -f /usr/bin/pacman ]; then
134
+            sudo chown $CURR_USER:$CURR_USER ~/ssh_config
135
+        else
136
+            sudo chown $CURR_USER:users ~/ssh_config
137
+        fi
109
         echo "   Ciphers $SSH_CIPHERS" >> ~/ssh_config
138
         echo "   Ciphers $SSH_CIPHERS" >> ~/ssh_config
110
         sudo mv ~/ssh_config /etc/ssh/ssh_config
139
         sudo mv ~/ssh_config /etc/ssh/ssh_config
111
         sudo chown root:root /etc/ssh/ssh_config
140
         sudo chown root:root /etc/ssh/ssh_config
113
     sudo sed -i "s/MACs.*/MACs $SSH_MACS/g" /etc/ssh/ssh_config
142
     sudo sed -i "s/MACs.*/MACs $SSH_MACS/g" /etc/ssh/ssh_config
114
     if ! grep -q "MACs " /etc/ssh/ssh_config; then
143
     if ! grep -q "MACs " /etc/ssh/ssh_config; then
115
         sudo cp /etc/ssh/ssh_config ~/ssh_config
144
         sudo cp /etc/ssh/ssh_config ~/ssh_config
116
-        sudo chown $CURR_USER:$CURR_USER ~/ssh_config
145
+        if [ ! -f /usr/bin/pacman ]; then
146
+            sudo chown $CURR_USER:$CURR_USER ~/ssh_config
147
+        else
148
+            sudo chown $CURR_USER:users ~/ssh_config
149
+        fi
117
         echo "   MACs $SSH_MACS" >> ~/ssh_config
150
         echo "   MACs $SSH_MACS" >> ~/ssh_config
118
         sudo mv ~/ssh_config /etc/ssh/ssh_config
151
         sudo mv ~/ssh_config /etc/ssh/ssh_config
119
         sudo chown root:root /etc/ssh/ssh_config
152
         sudo chown root:root /etc/ssh/ssh_config
156
 }
189
 }
157
 
190
 
158
 function configure_monkeysphere {
191
 function configure_monkeysphere {
192
+    if [ -f /usr/bin/pacman ]; then
193
+        return
194
+    fi
159
     sudo apt-get -y install tor connect-proxy monkeysphere
195
     sudo apt-get -y install tor connect-proxy monkeysphere
160
 }
196
 }
161
 
197
 
204
 configure_monkeysphere
240
 configure_monkeysphere
205
 if [[ $MESH_CLIENT_INSTALL == $'yes' || $MESH_CLIENT_INSTALL == $'y' || $MESH_CLIENT_INSTALL == $'on' ]]; then
241
 if [[ $MESH_CLIENT_INSTALL == $'yes' || $MESH_CLIENT_INSTALL == $'y' || $MESH_CLIENT_INSTALL == $'on' ]]; then
206
     echo $'Installing mesh packages'
242
     echo $'Installing mesh packages'
207
-    sudo apt-get -y install avahi-utils avahi-autoipd avahi-dnsconfd
243
+    if [ ! -f /usr/bin/pacman ]; then
244
+        sudo apt-get -y install avahi-utils avahi-autoipd avahi-dnsconfd
245
+    else
246
+        sudo pacman -S --noconfirm avahi
247
+    fi
208
     sudo ${PROJECT_NAME}-mesh-install -f tox_node
248
     sudo ${PROJECT_NAME}-mesh-install -f tox_node
209
     sudo ${PROJECT_NAME}-mesh-install -f toxic
249
     sudo ${PROJECT_NAME}-mesh-install -f toxic
210
     ${PROJECT_NAME}-mesh-install -f qtox
250
     ${PROJECT_NAME}-mesh-install -f qtox