free
/
freedombone
Следить 1
В избранное 0
Форкнуть 0
Код Задачи 0 Pull Request'ы 0 Релизы 0 Вики Активность
Просмотр исходного кода

Merge branch 'stretch' of https://github.com/bashrc/freedombone

Bob Mottram 8 лет назад
Родитель
15bc6b1f91 e9ebb25bab
Сommit
3588dc68e6
9 измененных файлов: 47 добавлений и 49 удалений
Единый вид Показать статистику Diff
  1. 1
    3
      doc/EN/app_icecast.org
  2. 1
    7
      doc/EN/index.org
  3. Двоичные данные
      img/bbb3.png
  4. 10
    8
      src/freedombone-app-smilodon
  5. 3
    0
      src/freedombone-base-email
  6. 1
    0
      src/freedombone-upgrade
  7. 10
    0
      src/freedombone-utils-web
  8. 17
    21
      website/EN/app_icecast.html
  9. 4
    10
      website/EN/index.html

+ 1
- 3
doc/EN/app_icecast.org Просмотреть файл

27 
 ssh myusername@mydomain -p 2222
 27 
 ssh myusername@mydomain -p 2222
28 
 #+end_src
 28 
 #+end_src
29
29
30 
-Using cursor keys, space bar and Enter key select *Administrator controls* and type in your password.
31 
-
32 
-Select *Add/Remove Apps*. If Vim is selected then you might want to unselect and uninstall it first, then select *icecast*.
30 
+Using cursor keys, space bar and Enter key select *Administrator controls* and type in your password. Select *Add/Remove Apps* then *icecast*.
33
31
34 
 If you then go to the *About* screen you'll see the onion address for Icecast and can navigate to it in a Tor compatible browser.
 32 
 If you then go to the *About* screen you'll see the onion address for Icecast and can navigate to it in a Tor compatible browser.
35
33

+ 1
- 7
doc/EN/index.org Просмотреть файл

8
8
9 
 #+BEGIN_CENTER
 9 
 #+BEGIN_CENTER
10 
 [[file:images/logo.png]]
 10 
 [[file:images/logo.png]]
11 
+[[file:images/bbb3.png]]
11 
 #+END_CENTER
 12 
 #+END_CENTER
12
13
13 
 #+begin_quote
 14 
 #+begin_quote
16 
 -- Lucas Nussbaum
 17 
 -- Lucas Nussbaum
17 
 #+end_quote
 18 
 #+end_quote
18
19
19 
-
20 
-#+BEGIN_EXPORT html
21 
-<center>
22 
-<h1><a href="./release3.html">New version 3 (Stretch)</a></h1>
23 
-</center>
24 
-#+END_EXPORT
25 
-
26 
 So you want to run your own internet services? Email, chat, VoIP, web sites, file synchronisation, wikis, blogs, social networks, media hosting, backups, VPN. Freedombone enables you to do all of that in a self-hosted way, where you keep control of your data and it resides in your own home.
 20 
 So you want to run your own internet services? Email, chat, VoIP, web sites, file synchronisation, wikis, blogs, social networks, media hosting, backups, VPN. Freedombone enables you to do all of that in a self-hosted way, where you keep control of your data and it resides in your own home.
27
21
28 
 [[./homeserver.html][Here's how]].
 22 
 [[./homeserver.html][Here's how]].

Двоичные данные
img/bbb3.png Просмотреть файл


+ 10
- 8
src/freedombone-app-smilodon Просмотреть файл

108 
 }
 108 
 }
109
109
110 
 function backup_local_smilodon {
 110 
 function backup_local_smilodon {
111 
-    if [ -d $SMILODON_PATH ]; then
112 
-        systemctl stop smilodon
111 
+    if [ ! -d $SMILODON_PATH ]; then
112 
+        return
113 
+    fi
113
114
114 
-        USE_MONGODB=1
115 
-        function_check backup_database_to_usb
116 
-        backup_database_to_usb smilodon
115 
+    systemctl stop smilodon
117
116
118 
-        backup_directory_to_usb $SMILODON_PATH smilodon
117 
+    USE_MONGODB=1
118 
+    function_check backup_database_to_usb
119 
+    backup_database_to_usb smilodon
119
120
120 
-        systemctl start smilodon
121 
-    fi
121 
+    backup_directory_to_usb $SMILODON_PATH smilodon
122 
+
123 
+    systemctl start smilodon
122 
 }
 124 
 }
123
125
124 
 function restore_local_smilodon {
 126 
 function restore_local_smilodon {

+ 3
- 0
src/freedombone-base-email Просмотреть файл

846 
     echo "dc_mailname_in_oh='true'" >> /etc/exim4/update-exim4.conf.conf
 846 
     echo "dc_mailname_in_oh='true'" >> /etc/exim4/update-exim4.conf.conf
847 
     echo "dc_localdelivery='maildir_home'" >> /etc/exim4/update-exim4.conf.conf
 847 
     echo "dc_localdelivery='maildir_home'" >> /etc/exim4/update-exim4.conf.conf
848 
     echo "dc_main_log_selector=-all" >> /etc/exim4/update-exim4.conf.conf
 848 
     echo "dc_main_log_selector=-all" >> /etc/exim4/update-exim4.conf.conf
849 
+
850 
+    echo "chunking_advertise_hosts =" > /etc/exim4/conf.d/main/04_exim4-config_chunking
851 
+
849 
     update-exim4.conf
 852 
     update-exim4.conf
850 
     sed -i "s/START=no/START=yes/g" /etc/default/saslauthd
 853 
     sed -i "s/START=no/START=yes/g" /etc/default/saslauthd
851 
     systemctl start saslauthd
 854 
     systemctl start saslauthd

+ 1
- 0
src/freedombone-upgrade Просмотреть файл

95
95
96 
         apt-get -yq -t stretch-backports install certbot
 96 
         apt-get -yq -t stretch-backports install certbot
97 
         email_install_tls
 97 
         email_install_tls
98 
+        email_disable_chunking
98 
         defrag_filesystem
 99 
         defrag_filesystem
99 
     fi
 100 
     fi
100 
 fi
 101 
 fi

+ 10
- 0
src/freedombone-utils-web Просмотреть файл

983 
     fi
 983 
     fi
984 
 }
 984 
 }
985
985
986 
+function email_disable_chunking {
987 
+    if [ -f /etc/exim4/conf.d/main/04_exim4-config_chunking ]; then
988 
+        return
989 
+    fi
990 
+    echo "chunking_advertise_hosts =" > /etc/exim4/conf.d/main/04_exim4-config_chunking
991 
+    update-exim4.conf
992 
+    dpkg-reconfigure --frontend noninteractive exim4-config
993 
+    systemctl restart exim4
994 
+}
995 
+
986 
 function email_install_tls {
 996 
 function email_install_tls {
987 
     tls_config_file=/etc/exim4/conf.d/main/03_exim4-config_tlsoptions
 997 
     tls_config_file=/etc/exim4/conf.d/main/03_exim4-config_tlsoptions
988 
     tls_auth_config_file=/etc/exim4/conf.d/auth/30_exim4-config_examples
 998 
     tls_auth_config_file=/etc/exim4/conf.d/auth/30_exim4-config_examples

+ 17
- 21
website/EN/app_icecast.html Просмотреть файл

3 
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 3 
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 
 <head>
 5 
 <head>
6 
-<!-- 2017-11-27 Mon 12:35 -->
6 
+<!-- 2017-11-27 Mon 12:43 -->
7 
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 7 
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8 
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 8 
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9 
 <title>&lrm;</title>
 9 
 <title>&lrm;</title>
256 
 This system is available only via an onion address, which should mitigate the potential for copyright disputes over streamed content. By default it's only set up to stream to a small number of users so that it doesn't put too much stress on CPU or memory requirements, although you can increase the maximum limit if you have a more powerful system and enough bandwidth.
 256 
 This system is available only via an onion address, which should mitigate the potential for copyright disputes over streamed content. By default it's only set up to stream to a small number of users so that it doesn't put too much stress on CPU or memory requirements, although you can increase the maximum limit if you have a more powerful system and enough bandwidth.
257 
 </p>
 257 
 </p>
258
258
259 
-<div id="outline-container-org9fecb99" class="outline-2">
260 
-<h2 id="org9fecb99">Installation</h2>
261 
-<div class="outline-text-2" id="text-org9fecb99">
259 
+<div id="outline-container-orgf3d9fbb" class="outline-2">
260 
+<h2 id="orgf3d9fbb">Installation</h2>
261 
+<div class="outline-text-2" id="text-orgf3d9fbb">
262 
 <p>
 262 
 <p>
263 
 Log into your system with:
 263 
 Log into your system with:
264 
 </p>
 264 
 </p>
269 
 </div>
 269 
 </div>
270
270
271 
 <p>
 271 
 <p>
272 
-Using cursor keys, space bar and Enter key select <b>Administrator controls</b> and type in your password.
273 
-</p>
274 
-
275 
-<p>
276 
-Select <b>Add/Remove Apps</b>. If Vim is selected then you might want to unselect and uninstall it first, then select <b>icecast</b>.
272 
+Using cursor keys, space bar and Enter key select <b>Administrator controls</b> and type in your password. Select <b>Add/Remove Apps</b> then <b>icecast</b>.
277 
 </p>
 273 
 </p>
278
274
279 
 <p>
 275 
 <p>
282 
 </div>
 278 
 </div>
283 
 </div>
 279 
 </div>
284
280
285 
-<div id="outline-container-orgf30a581" class="outline-2">
286 
-<h2 id="orgf30a581">Adding files to be streamed</h2>
287 
-<div class="outline-text-2" id="text-orgf30a581">
281 
+<div id="outline-container-orgcba32fc" class="outline-2">
282 
+<h2 id="orgcba32fc">Adding files to be streamed</h2>
283 
+<div class="outline-text-2" id="text-orgcba32fc">
288 
 <p>
 284 
 <p>
289 
 There are two ways to get files onto the system: either via ssh or via a USB drive. File types can be <b>ogg, ogv, mp3 or mp4</b> format.
 285 
 There are two ways to get files onto the system: either via ssh or via a USB drive. File types can be <b>ogg, ogv, mp3 or mp4</b> format.
290 
 </p>
 286 
 </p>
294 
 </p>
 290 
 </p>
295 
 </div>
 291 
 </div>
296
292
297 
-<div id="outline-container-org366fd74" class="outline-3">
298 
-<h3 id="org366fd74">From a USB drive</h3>
299 
-<div class="outline-text-3" id="text-org366fd74">
293 
+<div id="outline-container-org3b2c1e8" class="outline-3">
294 
+<h3 id="org3b2c1e8">From a USB drive</h3>
295 
+<div class="outline-text-3" id="text-org3b2c1e8">
300 
 <p>
 296 
 <p>
301 
 Create a directory on the USB drive named <b>icestream</b> and copy your files into there. Plug the drive into your server.
 297 
 Create a directory on the USB drive named <b>icestream</b> and copy your files into there. Plug the drive into your server.
302 
 </p>
 298 
 </p>
307 
 </div>
 303 
 </div>
308 
 </div>
 304 
 </div>
309
305
310 
-<div id="outline-container-orgbb75a88" class="outline-3">
311 
-<h3 id="orgbb75a88">Via ssh</h3>
312 
-<div class="outline-text-3" id="text-orgbb75a88">
306 
+<div id="outline-container-org9ba9caf" class="outline-3">
307 
+<h3 id="org9ba9caf">Via ssh</h3>
308 
+<div class="outline-text-3" id="text-org9ba9caf">
313 
 <p>
 309 
 <p>
314 
 Make a directory named <b>icestream</b> and copy your files into it. Then copy the directory to your server.
 310 
 Make a directory named <b>icestream</b> and copy your files into it. Then copy the directory to your server.
315 
 </p>
 311 
 </p>
335 
 </div>
 331 
 </div>
336 
 </div>
 332 
 </div>
337
333
338 
-<div id="outline-container-orgdc2e42f" class="outline-2">
339 
-<h2 id="orgdc2e42f">Access controls</h2>
340 
-<div class="outline-text-2" id="text-orgdc2e42f">
334 
+<div id="outline-container-orge68b817" class="outline-2">
335 
+<h2 id="orge68b817">Access controls</h2>
336 
+<div class="outline-text-2" id="text-orge68b817">
341 
 <p>
 337 
 <p>
342 
 By default anyone who happens to find your Icecast onion address can listen to your stream. If you only want it to be available to a few friends or family then you can add an extra login password.
 338 
 By default anyone who happens to find your Icecast onion address can listen to your stream. If you only want it to be available to a few friends or family then you can add an extra login password.
343 
 </p>
 339 
 </p>

+ 4
- 10
website/EN/index.html Просмотреть файл

3 
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 3 
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 
 <head>
 5 
 <head>
6 
-<!-- 2017-10-15 Sun 11:26 -->
6 
+<!-- 2017-11-27 Mon 13:21 -->
7 
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 7 
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8 
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 8 
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9 
 <title>&lrm;</title>
 9 
 <title>&lrm;</title>
237 
 </div>
 237 
 </div>
238 
 <div id="content">
 238 
 <div id="content">
239 
 <div class="org-center">
 239 
 <div class="org-center">
240 
-
241 
-<div class="figure">
242 
-<p><img src="images/logo.png" alt="logo.png" />
240 
+<p>
241 
+<img src="images/logo.png" alt="logo.png" />
242 
+<img src="images/bbb3.png" alt="bbb3.png" />
243 
 </p>
 243 
 </p>
244 
 </div>
 244 
 </div>
245 
-</div>
246
245
247 
 <blockquote>
 246 
 <blockquote>
248 
 <p>
 247 
 <p>
254 
 </p>
 253 
 </p>
255 
 </blockquote>
 254 
 </blockquote>
256
255
257 
-
258 
-<center>
259 
-<h1><a href="./release3.html">New version 3 (Stretch)</a></h1>
260 
-</center>
261 
-
262 
 <p>
 256 
 <p>
263 
 So you want to run your own internet services? Email, chat, VoIP, web sites, file synchronisation, wikis, blogs, social networks, media hosting, backups, VPN. Freedombone enables you to do all of that in a self-hosted way, where you keep control of your data and it resides in your own home.
 257 
 So you want to run your own internet services? Email, chat, VoIP, web sites, file synchronisation, wikis, blogs, social networks, media hosting, backups, VPN. Freedombone enables you to do all of that in a self-hosted way, where you keep control of your data and it resides in your own home.
264 
 </p>
 258 
 </p>