JOSM installation disabled (client desktop), closes #501

gislab-npo · Sep 27, 2016 · 8ff7421 · 8ff7421
1 parent b4284b1
commit 8ff7421
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/providers/gislab-unit/iso/gislab.seed.template b/providers/gislab-unit/iso/gislab.seed.template
@@ -69,14 +69,14 @@ d-i partman-auto/expert_recipe string                   \
             use_filesystem{ } filesystem{ ext4 }        \
             mountpoint{ / }                             \
         .                                               \
-        33000 100 33000 ext4                            \
+        209500 100 209500 ext4                          \
             $lvmok{ }                                   \
             lv_name{ storage }                          \
             method{ format } format{ }                  \
             use_filesystem{ } filesystem{ ext4 }        \
             mountpoint{ /storage }                      \
         .                                               \
-        4300 100 4300 linux-swap                        \
+        8300 100 8300 linux-swap                        \
             $lvmok{ }                                   \
             lv_name{ swap }                             \
             method{ swap } format{ }                    \

diff --git a/system/roles/basic-configuration/templates/apt/sources.list.j2 b/system/roles/basic-configuration/templates/apt/sources.list.j2
@@ -15,7 +15,8 @@ deb http://archive.canonical.com/ubuntu {{ ansible_distribution_release }} partn
 deb http://ppa.launchpad.net/gislab-npo/production/ubuntu {{ ansible_distribution_release }} main
 
 #### JOSM repository
-deb http://josm.openstreetmap.de/apt {{ ansible_distribution_release }} universe
+#### Disabled, see https://github.com/gislab-npo/gislab/issues/501
+# deb http://josm.openstreetmap.de/apt {{ ansible_distribution_release }} universe
 
 {% if GISLAB_APT_CUSTOM_REPOSITORIES %}
 #### Custom repositories

diff --git a/system/roles/client-desktop/vars/main.yml b/system/roles/client-desktop/vars/main.yml
@@ -197,7 +197,6 @@ packages_lab:
   - grass7
   - grass7-doc
   - ipython
-  - josm
   - pgadmin3
   - postgresql-client
   - postgresql-comparator
@@ -210,7 +209,8 @@ packages_lab:
   - spatialite-bin
   - spatialite-gui
   - sqlite3
-
+#### JOSM installation disabled, see https://github.com/gislab-npo/gislab/issues/501
+#  - josm
 
 packages_worker:
   # OWS worker packages