Sfoglia il codice sorgente

Use mail rather than htdocs

Bob Mottram 8 anni fa
parent
commit
99ea6ab974
1 ha cambiato i file con 12 aggiunte e 12 eliminazioni
  1. 12
    12
      src/freedombone-app-mailpile

+ 12
- 12
src/freedombone-app-mailpile Vedi File

83
     read_config_param "MAILPILE_DOMAIN_NAME"
83
     read_config_param "MAILPILE_DOMAIN_NAME"
84
 
84
 
85
     function_check set_repo_commit
85
     function_check set_repo_commit
86
-    set_repo_commit /var/www/$MAILPILE_DOMAIN_NAME/htdocs "mailpile commit" "$MAILPILE_COMMIT" $MAILPILE_REPO
86
+    set_repo_commit /var/www/$MAILPILE_DOMAIN_NAME/mail "mailpile commit" "$MAILPILE_COMMIT" $MAILPILE_REPO
87
 }
87
 }
88
 
88
 
89
 function backup_local_mailpile {
89
 function backup_local_mailpile {
155
     fi
155
     fi
156
 
156
 
157
     cd /var/www/$MAILPILE_DOMAIN_NAME
157
     cd /var/www/$MAILPILE_DOMAIN_NAME
158
-    if [ -d /var/www/$MAILPILE_DOMAIN_NAME/htdocs ]; then
159
-        rm -rf /var/www/$MAILPILE_DOMAIN_NAME/htdocs
158
+    if [ -d /var/www/$MAILPILE_DOMAIN_NAME/mail ]; then
159
+        rm -rf /var/www/$MAILPILE_DOMAIN_NAME/mail
160
     fi
160
     fi
161
-    git_clone $MAILPILE_REPO htdocs
162
-    cd htdocs
161
+    git_clone $MAILPILE_REPO mail
162
+    cd mail
163
     git checkout $MAILPILE_COMMIT -b $MAILPILE_COMMIT
163
     git checkout $MAILPILE_COMMIT -b $MAILPILE_COMMIT
164
     set_completion_param "mailpile commit" "$MAILPILE_COMMIT"
164
     set_completion_param "mailpile commit" "$MAILPILE_COMMIT"
165
 
165
 
169
     fi
169
     fi
170
     pip install -r requirements.txt
170
     pip install -r requirements.txt
171
 
171
 
172
-    adduser --system --home=/var/www/$MAILPILE_DOMAIN_NAME/htdocs/ --group mailpile
173
-    chown -R mailpile: /var/www/$MAILPILE_DOMAIN_NAME/htdocs/
172
+    adduser --system --home=/var/www/$MAILPILE_DOMAIN_NAME/mail/ --group mailpile
173
+    chown -R mailpile: /var/www/$MAILPILE_DOMAIN_NAME/mail/
174
 
174
 
175
     # create folders and tags
175
     # create folders and tags
176
-    su -c "cd /var/www/$MAILPILE_DOMAIN_NAME/htdocs && ./mp --setup" - mailpile
176
+    su -c "cd /var/www/$MAILPILE_DOMAIN_NAME/mail && ./mp --setup" - mailpile
177
 
177
 
178
     echo '[Unit]' > /etc/systemd/system/mailpile.service
178
     echo '[Unit]' > /etc/systemd/system/mailpile.service
179
     echo 'Description=Mailpile Email Client' >> /etc/systemd/system/mailpile.service
179
     echo 'Description=Mailpile Email Client' >> /etc/systemd/system/mailpile.service
182
     echo '[Service]' >> /etc/systemd/system/mailpile.service
182
     echo '[Service]' >> /etc/systemd/system/mailpile.service
183
     echo 'User=mailpile' >> /etc/systemd/system/mailpile.service
183
     echo 'User=mailpile' >> /etc/systemd/system/mailpile.service
184
     echo 'Group=mailpile' >> /etc/systemd/system/mailpile.service
184
     echo 'Group=mailpile' >> /etc/systemd/system/mailpile.service
185
-    echo "WorkingDirectory=/var/www/$MAILPILE_DOMAIN_NAME/htdocs" >> /etc/systemd/system/mailpile.service
186
-    echo "ExecStart=/var/www/$MAILPILE_DOMAIN_NAME/htdocs/mp --www=0.0.0.0:${MAILPILE_PORT} --wait" >> /etc/systemd/system/mailpile.service
185
+    echo "WorkingDirectory=/var/www/$MAILPILE_DOMAIN_NAME/mail" >> /etc/systemd/system/mailpile.service
186
+    echo "ExecStart=/var/www/$MAILPILE_DOMAIN_NAME/mail/mp --www=0.0.0.0:${MAILPILE_PORT} --wait" >> /etc/systemd/system/mailpile.service
187
     echo 'Restart=always' >> /etc/systemd/system/mailpile.service
187
     echo 'Restart=always' >> /etc/systemd/system/mailpile.service
188
     echo 'RestartSec=10' >> /etc/systemd/system/mailpile.service
188
     echo 'RestartSec=10' >> /etc/systemd/system/mailpile.service
189
     echo '' >> /etc/systemd/system/mailpile.service
189
     echo '' >> /etc/systemd/system/mailpile.service
214
             echo '  error_log off;' >> $mailpile_nginx_site
214
             echo '  error_log off;' >> $mailpile_nginx_site
215
             echo '' >> $mailpile_nginx_site
215
             echo '' >> $mailpile_nginx_site
216
             echo '  # Root' >> $mailpile_nginx_site
216
             echo '  # Root' >> $mailpile_nginx_site
217
-            echo "  root /var/www/$MAILPILE_DOMAIN_NAME/htdocs;" >> $mailpile_nginx_site
217
+            echo "  root /var/www/$MAILPILE_DOMAIN_NAME/mail;" >> $mailpile_nginx_site
218
             echo '' >> $mailpile_nginx_site
218
             echo '' >> $mailpile_nginx_site
219
             echo '  location / {' >> $mailpile_nginx_site
219
             echo '  location / {' >> $mailpile_nginx_site
220
             function_check nginx_limits
220
             function_check nginx_limits
239
         echo '  error_log off;' >> $mailpile_nginx_site
239
         echo '  error_log off;' >> $mailpile_nginx_site
240
         echo '' >> $mailpile_nginx_site
240
         echo '' >> $mailpile_nginx_site
241
         echo '  # Root' >> $mailpile_nginx_site
241
         echo '  # Root' >> $mailpile_nginx_site
242
-        echo "  root /var/www/$MAILPILE_DOMAIN_NAME/htdocs;" >> $mailpile_nginx_site
242
+        echo "  root /var/www/$MAILPILE_DOMAIN_NAME/mail;" >> $mailpile_nginx_site
243
         echo '' >> $mailpile_nginx_site
243
         echo '' >> $mailpile_nginx_site
244
         echo '  location / {' >> $mailpile_nginx_site
244
         echo '  location / {' >> $mailpile_nginx_site
245
         function_check nginx_limits
245
         function_check nginx_limits