- tor-commits - lists.torproject.org

r25207: {website} make it much more obvious that the torbutton page isn't for (website/trunk/torbutton/en)
by Roger Dingledine 12 Nov '11

12 Nov '11

Author: arma Date: 2011-11-12 22:39:58 +0000 (Sat, 12 Nov 2011) New Revision: 25207 Modified: website/trunk/torbutton/en/index.wml Log: make it much more obvious that the torbutton page isn't for users Modified: website/trunk/torbutton/en/index.wml =================================================================== --- website/trunk/torbutton/en/index.wml 2011-11-12 21:56:42 UTC (rev 25206) +++ website/trunk/torbutton/en/index.wml 2011-11-12 22:39:58 UTC (rev 25207) @@ -85,23 +85,42 @@ <h2>Torbutton</h2> <hr> - + + + Torbutton is the component in <a href="<page projects/torbrowser>">Tor + Browser Bundle</a> that takes care of application-level + security and privacy concerns in Firefox. To keep you safe, + Torbutton disables many types of active content. + + + + Now that the <a href="<page projects/torbrowser>">Tor Browser + Bundle</a> includes a patched version of Firefox, and because we don't + have enough developer resources to keep up with the accelerated + Firefox release schedule, the toggle model of Torbutton is <a + href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no + longer recommended</a>. Users should be using Tor Browser Bundle, + not installing Torbutton themselves. + + + Current stable version:<version-torbutton> Current alpha version:<version-torbutton-alpha> Maintainer: Mike Perry - Install Stable: Click to <a + Expert Install (Stable): Click to <a href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi" hash="<version-hash-torbutton>" onclick="return install(event);">install from this website</a>. Verify the <a href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi.asc">signature</a>.  + Past Releases: <a href="https://archive.torproject.org/tor-package-archive/torbutton/">Tor Archive</a> - Developer Documentation: <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a> Source: You can <a @@ -119,47 +138,11 @@ Bug Reports: <a href="https://trac.torproject.org/projects/tor/report/14">Torproject Bug Tracker</a> Documents: [ <a href="<page torbutton/torbutton-faq>">FAQ</a> | + <a href="<page torbutton/torbutton-options>">Torbutton options</a> | <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG">changelog</a> | <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/LICENSE">license</a> | - <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">credits</a> ] + <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">credits</a> ] - - - - Torbutton is the component in <a href="<page projects/torbrowser>">Tor - Browser Bundle</a> that takes care of application-level security - and privacy concerns in Firefox. To keep you safe, Torbutton - disables many types of active content. You can learn more from - the <a href="en/design/index.html.en">Design Document</a>, the <a - href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>, or read more - details in the <a href="<page torbutton/torbutton-options>">Torbutton - options</a> list. - - - - Some users may prefer a toolbar button instead of a statusbar panel. - Torbutton lets you add a toolbar button by right-clicking - on the desired toolbar, selecting "Customize...", and then dragging the - Torbutton icon onto the toolbar. There is an option in the preferences - to hide the statusbar panel (Tools->Extensions, select Torbutton, - and click on Preferences). - - - - Originally Torbutton was a 1-click way for Firefox users to enable or disable - the browser's use of <a href="<page index>">Tor</a>. - (It adds a panel to the statusbar that says "Tor Enabled" (in green) or - "Tor Disabled" (in red). The user may click on the panel to toggle - the status. If the user (or some other extension) changes the proxy - settings, the change is automatically reflected in the statusbar.) But - now that the <a href="<page projects/torbrowser>">Tor Browser - Bundle</a> includes a patched version of Firefox, and because we don't - have enough developer resources to keep up with the accelerated - Firefox release schedule, the toggle model of Torbutton is <a - href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no - longer recommended</a>. - - </div>  <div id = "sidecol">

1 0

r25206: {website} make the 'no longer recommended' part a bit more obvious (website/trunk/torbutton/en)
by Roger Dingledine 12 Nov '11

12 Nov '11

Author: arma Date: 2011-11-12 21:56:42 +0000 (Sat, 12 Nov 2011) New Revision: 25206 Modified: website/trunk/torbutton/en/index.wml Log: make the 'no longer recommended' part a bit more obvious Modified: website/trunk/torbutton/en/index.wml =================================================================== --- website/trunk/torbutton/en/index.wml 2011-11-12 21:50:30 UTC (rev 25205) +++ website/trunk/torbutton/en/index.wml 2011-11-12 21:56:42 UTC (rev 25206) @@ -137,6 +137,15 @@ + Some users may prefer a toolbar button instead of a statusbar panel. + Torbutton lets you add a toolbar button by right-clicking + on the desired toolbar, selecting "Customize...", and then dragging the + Torbutton icon onto the toolbar. There is an option in the preferences + to hide the statusbar panel (Tools->Extensions, select Torbutton, + and click on Preferences). + + + Originally Torbutton was a 1-click way for Firefox users to enable or disable the browser's use of <a href="<page index>">Tor</a>. (It adds a panel to the statusbar that says "Tor Enabled" (in green) or @@ -151,14 +160,6 @@ longer recommended</a>. - - Some users may prefer a toolbar button instead of a statusbar panel. - Torbutton lets you add a toolbar button by right-clicking - on the desired toolbar, selecting "Customize...", and then dragging the - Torbutton icon onto the toolbar. There is an option in the preferences - to hide the statusbar panel (Tools->Extensions, select Torbutton, - and click on Preferences). - </div>  <div id = "sidecol">

1 0

r25205: {website} tell people that the torbutton toggle model is no longer rec (website/trunk/torbutton/en)
by Roger Dingledine 12 Nov '11

12 Nov '11

Author: arma Date: 2011-11-12 21:50:30 +0000 (Sat, 12 Nov 2011) New Revision: 25205 Modified: website/trunk/torbutton/en/index.wml Log: tell people that the torbutton toggle model is no longer recommended Modified: website/trunk/torbutton/en/index.wml =================================================================== --- website/trunk/torbutton/en/index.wml 2011-11-12 21:23:58 UTC (rev 25204) +++ website/trunk/torbutton/en/index.wml 2011-11-12 21:50:30 UTC (rev 25205) @@ -126,22 +126,32 @@ - Torbutton is a 1-click way for Firefox users to enable or disable + Torbutton is the component in <a href="<page projects/torbrowser>">Tor + Browser Bundle</a> that takes care of application-level security + and privacy concerns in Firefox. To keep you safe, Torbutton + disables many types of active content. You can learn more from + the <a href="en/design/index.html.en">Design Document</a>, the <a + href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>, or read more + details in the <a href="<page torbutton/torbutton-options>">Torbutton + options</a> list. + + + + Originally Torbutton was a 1-click way for Firefox users to enable or disable the browser's use of <a href="<page index>">Tor</a>. - It adds a panel to the statusbar that says "Tor Enabled" (in green) or + (It adds a panel to the statusbar that says "Tor Enabled" (in green) or "Tor Disabled" (in red). The user may click on the panel to toggle the status. If the user (or some other extension) changes the proxy - settings, the change is automatically reflected in the statusbar. + settings, the change is automatically reflected in the statusbar.) But + now that the <a href="<page projects/torbrowser>">Tor Browser + Bundle</a> includes a patched version of Firefox, and because we don't + have enough developer resources to keep up with the accelerated + Firefox release schedule, the toggle model of Torbutton is <a + href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no + longer recommended</a>. - + - To keep you safe, Torbutton disables many types of active content. You - can learn more from the <a href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>, - or read more details in the <a href="<page torbutton/torbutton-options>">Torbutton - options</a> list. - - - Some users may prefer a toolbar button instead of a statusbar panel. Torbutton lets you add a toolbar button by right-clicking on the desired toolbar, selecting "Customize...", and then dragging the @@ -158,4 +168,5 @@  </div>  -#include <foot.wmi> +#include <foot.wmi> +

1 0

r25204: {website} revert erinn's makefile clobber from r25202 (website/trunk)
by Roger Dingledine 12 Nov '11

12 Nov '11

Author: arma Date: 2011-11-12 21:23:58 +0000 (Sat, 12 Nov 2011) New Revision: 25204 Modified: website/trunk/Makefile Log: revert erinn's makefile clobber from r25202 Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-11-12 10:23:19 UTC (rev 25203) +++ website/trunk/Makefile 2011-11-12 21:23:58 UTC (rev 25204) @@ -10,9 +10,9 @@ # 4. make # 5. ./publish -export TORGIT=/Users/erinn/src/tor.git/.git -export STABLETAG=tor-0.2.2.24-alpha -export DEVTAG=tor-0.2.2.24-alpha +export TORGIT=/home/runa/tordev/tor/.git +export STABLETAG=tor-0.2.2.34 +export DEVTAG=tor-0.2.3.7-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton

1 0

[orbot/master] updated strings; modified iptables clear behavior;
by n8fr8＠torproject.org 12 Nov '11

12 Nov '11

commit 8e199a3e9cedf6d4bbca912bd9c7ddab06ba8835 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Nov 12 11:56:16 2011 -0500 updated strings; modified iptables clear behavior; --- res/values/strings.xml | 16 ++ src/org/torproject/android/service/TorService.java | 203 ++++++++++---------- 2 files changed, 119 insertions(+), 100 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index a060d55..e465e20 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -183,5 +183,21 @@ <string name="pref_proxy_port_title">Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> +<string name="status">Status</string> +<string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string> +<string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string> +<string name="transparent_proxying_enabled">Transparent proxying ENABLED</string> +<string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> +<string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string> +<string name="transproxy_rules_cleared">TransProxy rules cleared</string> +<string name="couldn_t_start_tor_process_">"Couldn't start Tor process: "</string> +<string name="privoxy_is_running_on_port_">Privoxy is running on port: </string> +<string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string> +<string name="bridge_error">Bridge Error</string> +<string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string> +<string name="send_email_for_bridges">Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string> +<string name="error">Error</string> +<string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> +<string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> </resources> diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index c4b7b1f..23396c3 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -275,7 +275,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst showToolbarNotification (getString(R.string.status_disabled),NOTIFY_ID,R.drawable.tornotificationoff); sendCallbackStatusMessage(getString(R.string.status_disabled)); - setupTransProxy(false); + clearTransparentProxy(); } catch (Exception e) { @@ -495,7 +495,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - setupTransProxy(true); + enableTransparentProxy(); runTorShellCmd(); runPrivoxyShellCmd(); @@ -513,20 +513,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst * * the idea is that if Tor is off then transproxy is off */ - private boolean setupTransProxy (boolean activate) throws Exception + private boolean enableTransparentProxy () throws Exception { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); boolean hasRoot = prefs.getBoolean(PREF_HAS_ROOT,false); + boolean enableTransparentProxy = prefs.getBoolean("pref_transparent", false); - if (!hasRoot) - { - - } - else if (activate) + if (hasRoot && enableTransparentProxy) { - boolean enableTransparentProxy = prefs.getBoolean("pref_transparent", false); boolean transProxyAll = prefs.getBoolean("pref_transparent_all", false); boolean transProxyPortFallback = prefs.getBoolean("pref_transparent_port_fallback", false); boolean transProxyTethering = prefs.getBoolean("pref_transparent_tethering", false); @@ -535,83 +531,92 @@ public class TorService extends Service implements TorServiceConstants, TorConst String portProxyList = prefs.getString("pref_port_list", ""); - if (enableTransparentProxy) - { - //TODO: Find a nice place for the next (commented) line - //TorTransProxy.setDNSProxying(); + + //TODO: Find a nice place for the next (commented) line + //TorTransProxy.setDNSProxying(); + + int code = 0; // Default state is "okay" - int code = 0; // Default state is "okay" - - if(transProxyPortFallback) - { - showAlert("Status", "Setting up port-based transparent proxying..."); - StringTokenizer st = new StringTokenizer(portProxyList, ","); - int status = code; - while (st.hasMoreTokens()) - { - status = TorTransProxy.setTransparentProxyingByPort(this, Integer.parseInt(st.nextToken())); - if(status != 0) - code = status; - } - } - else + if(transProxyPortFallback) + { + showAlert(getString(R.string.status), getString(R.string.setting_up_port_based_transparent_proxying_)); + StringTokenizer st = new StringTokenizer(portProxyList, ","); + int status = code; + while (st.hasMoreTokens()) { - if(transProxyAll) - { - showAlert("Status", "Setting up full transparent proxying..."); - code = TorTransProxy.setTransparentProxyingAll(this); - } - else - { - showAlert("Status", "Setting up app-based transparent proxying..."); - code = TorTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this)); - } - + status = TorTransProxy.setTransparentProxyingByPort(this, Integer.parseInt(st.nextToken())); + if(status != 0) + code = status; } - - TorService.logMessage ("TorTransProxy resp code: " + code); - - if (code == 0) + } + else + { + if(transProxyAll) { - showAlert("Status", "Transparent proxying ENABLED"); - - - - if (transProxyTethering) - { - showAlert("Status", "TransProxy enabled for Tethering!"); - - TorTransProxy.enableTetheringRules(this); - - // mBinder.updateConfiguration("TransListenAddress", "0.0.0.0", false); - // mBinder.updateConfiguration("DNSListenAddress", "0.0.0.0", false); - - } + showAlert(getString(R.string.status), getString(R.string.setting_up_full_transparent_proxying_)); + code = TorTransProxy.setTransparentProxyingAll(this); } else { - showAlert("Status", "WARNING: error starting transparent proxying!"); + showAlert(getString(R.string.status), getString(R.string.setting_up_app_based_transparent_proxying_)); + code = TorTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this)); } - + } + + TorService.logMessage ("TorTransProxy resp code: " + code); - return true; - - } - else - { - TorTransProxy.purgeIptables(this); - showAlert("Status", "Transparent proxying: DISABLED"); - } - } - else - { - TorTransProxy.purgeIptables(this); - showAlert("Status", "Transparent proxying: DISABLED"); + if (code == 0) + { + showAlert(getString(R.string.status), getString(R.string.transparent_proxying_enabled)); + + + + if (transProxyTethering) + { + showAlert(getString(R.string.status), getString(R.string.transproxy_enabled_for_tethering_)); + TorTransProxy.enableTetheringRules(this); + + } + } + else + { + showAlert(getString(R.string.status), getString(R.string.warning_error_starting_transparent_proxying_)); + } + + return true; } + else + return false; + } + + /* + * activate means whether to apply the users preferences + * or clear them out + * + * the idea is that if Tor is off then transproxy is off + */ + private boolean clearTransparentProxy () throws Exception + { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - return true; + boolean hasRoot = prefs.getBoolean(PREF_HAS_ROOT,false); + boolean enableTransparentProxy = prefs.getBoolean("pref_transparent", false); + + if (hasRoot && enableTransparentProxy) + { + + TorService.logMessage ("Clearing TransProxy rules"); + + TorTransProxy.purgeIptables(this); + + showAlert(getString(R.string.status), getString(R.string.transproxy_rules_cleared)); + + return true; + } + else + return false; } private void runTorShellCmd() throws Exception @@ -657,7 +662,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (procId == -1) { - sendCallbackStatusMessage("Couldn't start Tor process.\nretrying..." + log.toString()); + sendCallbackStatusMessage(getString(R.string.couldn_t_start_tor_process_) + log.toString()); Thread.sleep(torRetryWaitTimeMS); attempts++; } @@ -723,7 +728,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice(log.toString()); } - sendCallbackLogMessage("Privoxy is running on port: " + PORT_HTTP); + sendCallbackLogMessage(getString(R.string.privoxy_is_running_on_port_) + PORT_HTTP); logNotice("Privoxy process id=" + privoxyProcId); @@ -926,13 +931,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void showAlert(String title, String msg) { - /* - new AlertDialog.Builder(this) - .setTitle(title) - .setMessage(msg) - .setPositiveButton(android.R.string.ok, null) - .show(); - */ showToolbarNotification(msg, NOTIFY_ID, R.drawable.tornotification); } @@ -1088,6 +1086,25 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { applyPreferences(); + + + + if (currentStatus == STATUS_ON) + { + //reset iptables rules in active mode + + try + { + clearTransparentProxy(); + enableTransparentProxy(); + } + catch (Exception e) + { + logException("unable to setup transproxy",e); + } + } + + } catch (RemoteException e) { logException ("error applying prefs",e); } @@ -1304,20 +1321,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst } } - if (currentStatus == STATUS_ON) - { - //reset iptables rules in active mode - - try - { - setupTransProxy(true); - } - catch (Exception e) - { - logException("unable to setup transproxy",e); - } - } - File fileGeoIP = new File(appBinHome,"geoip"); mBinder.updateConfiguration("GeoIPFile", fileGeoIP.getAbsolutePath(), false); mBinder.updateConfiguration("EntryNodes", entranceNodes, false); @@ -1332,8 +1335,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (bridgeList == null || bridgeList.length() == 0) { - showAlert("Bridge Error","In order to use the bridge feature, you must enter at least one bridge IP address." + - "Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account."); + showAlert(getString(R.string.bridge_error),getString(R.string.bridge_requires_ip) + + getString(R.string.send_email_for_bridges)); return false; @@ -1383,7 +1386,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - showAlert("Config Error","Your ReachableAddresses settings caused an exception!"); + showAlert(getString(R.string.error),getString(R.string.your_reachableaddresses_settings_caused_an_exception_)); return false; } @@ -1409,7 +1412,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - showAlert("Uh-oh!","Your relay settings caused an exception!"); + showAlert(getString(R.string.error),getString(R.string.your_relay_settings_caused_an_exception_)); return false; }

1 0

[orbot/master] updated version
by n8fr8＠torproject.org 12 Nov '11

12 Nov '11

commit 48141d4c0b94b9eda58a6155f5fd13e95202c0eb Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Nov 12 12:21:51 2011 -0500 updated version --- AndroidManifest.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 365d3f9..9b7af10 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.3.7-alpha-orbot-1.0.6-RC3" android:versionCode="19"> + package="org.torproject.android" android:versionName="0.2.3.7-alpha-orbot-1.0.6-RC4" android:versionCode="20"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

1 0

[tor-cloud/master] Maybe those lines were necessary after all...
by runa＠torproject.org 12 Nov '11

12 Nov '11

commit 1a3d07d0aff8c0cf6a36deda112ed8608d416ad0 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Nov 12 16:26:10 2011 +0000 Maybe those lines were necessary after all... --- ec2-prep.sh | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index a5c4ac1..8a436c4 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -184,10 +184,9 @@ fi # XXX TODO # Generally, we'll want to rm /var/lib/tor/* and remove all state from the system -#echo "Restarting Tor..."; -#/etc/init.d/tor restart -#sudo update-rc.d tor enable -#echo "echo 'Tor Cloud Starting...'" > /etc/ec2-prep.sh +echo "Restarting Tor..."; +/etc/init.d/tor restart +update-rc.d tor enable # We're done; tell the user and then reboot the system echo "Done configuring the system, will reboot"

1 0

[tor-cloud/master] Comment out some unnecessary lines
by runa＠torproject.org 12 Nov '11

12 Nov '11

commit 88263af151ee5835f0ad33f63c69a45e278011f5 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Nov 12 16:06:14 2011 +0000 Comment out some unnecessary lines --- ec2-prep.sh | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index 3caac60..a5c4ac1 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -184,9 +184,11 @@ fi # XXX TODO # Generally, we'll want to rm /var/lib/tor/* and remove all state from the system -echo "Restarting Tor..."; -/etc/init.d/tor restart -sudo update-rc.d tor enable -echo "echo 'Tor Cloud Starting...'" > /etc/ec2-prep.sh - -sudo reboot +#echo "Restarting Tor..."; +#/etc/init.d/tor restart +#sudo update-rc.d tor enable +#echo "echo 'Tor Cloud Starting...'" > /etc/ec2-prep.sh + +# We're done; tell the user and then reboot the system +echo "Done configuring the system, will reboot" +reboot

1 0

[tor-cloud/master] Turns out, cloudimg-rootfs is the correct filesystem label
by runa＠torproject.org 12 Nov '11

12 Nov '11

commit 7645cb65de23a1a0a7d6b3750a44262ebe6492ef Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Nov 12 16:08:09 2011 +0000 Turns out, cloudimg-rootfs is the correct filesystem label --- build.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build.sh b/build.sh index 0d4e47b..1d34eb5 100755 --- a/build.sh +++ b/build.sh @@ -84,7 +84,7 @@ ec2-attach-volume --instance ${iid} --region ${region} --device /dev/sdh ${vol} echo "After attaching the volume, sleep for 20 seconds..." sleep 20 -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && wget https://uec-images.ubuntu.com/releases/10.04/release/SHA256SUMS && wget https://uec-images.ubuntu.com/releases/10.04/release/SHA256SUMS.gpg && wget https://uec-images.ubuntu.com/releases/10.04/release/ubuntu-10.04-server-cl… -O ubuntu-10.04-server-cloudimg-i386.tar.gz && tar -Sxvzf /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz && sudo mkdir src target && sudo mount -o loop,rw /mnt/lucid-server-cloudimg-i386.img /mnt/src && sudo mkfs.ext4 -F -L uec-rootfs /dev/sdh && sudo mount /dev/sdh /mnt/target" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && wget https://uec-images.ubuntu.com/releases/10.04/release/SHA256SUMS && wget https://uec-images.ubuntu.com/releases/10.04/release/SHA256SUMS.gpg && wget https://uec-images.ubuntu.com/releases/10.04/release/ubuntu-10.04-server-cl… -O ubuntu-10.04-server-cloudimg-i386.tar.gz && tar -Sxvzf /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz && sudo mkdir src target && sudo mount -o loop,rw /mnt/lucid-server-cloudimg-i386.img /mnt/src && sudo mkfs.ext4 -F -L cloudimg-rootfs /dev/sdh && sudo mount /dev/sdh /mnt/target" # TODO: fix GPG verification, exit on failed verification #ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "gpg --verify /mnt/SHA256SUMS.gpg /mnt/SHA256SUMS &> /mnt/verify.txt"

1 0

[tor-cloud/master] The unattended-upgrades package is already installed, just configure it
by runa＠torproject.org 12 Nov '11

12 Nov '11

commit 3341078040e31d0ff81596c0addb03205eac6d80 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Nov 12 15:59:28 2011 +0000 The unattended-upgrades package is already installed, just configure it --- ec2-prep.sh | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index f1426c7..3caac60 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -21,18 +21,14 @@ echo "root required; re-run with sudo"; exit 1; fi -# Install and configure unattended-upgrades. The system will -# automatically download, install and configure all packages, and reboot -# if necessary. -echo "Installing unattended-upgrades..." -aptitude install unattended-upgrades +# Configure unattended-upgrades. The system will automatically download, +# install and configure all packages, and reboot if necessary. +echo "Configuring the unattended-upgrades package..." # Back up the original configuration mv /etc/apt/apt.conf.d/10periodic /etc/apt/apt.conf.d/10periodic.bkp mv /etc/apt/apt.conf.d/50unattended-upgrades /etc/apt/apt.conf.d/50unattended-upgrades.bkp -echo "Configuring the unattended-upgrades package..." - # Choose what to upgrade in 10periodic cat << EOF > $PERIODIC # Update the package list, download, and install available upgrades

1 0