diff options
| -rw-r--r-- | Vagrantfile | 6 | ||||
| -rw-r--r-- | provisioning/modules/pixelated/files/apt/pixelated-preferences | 11 | ||||
| -rw-r--r-- | provisioning/modules/pixelated/files/apt/pixelated.list | 3 | ||||
| -rw-r--r-- | provisioning/modules/pixelated/manifests/apt.pp | 8 | ||||
| -rw-r--r-- | web-ui/app/scss/_mixins.scss | 1 |
5 files changed, 24 insertions, 5 deletions
diff --git a/Vagrantfile b/Vagrantfile index db24483d..76fa6fa6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -38,12 +38,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # until https://github.com/pixelated-project/pixelated-user-agent/issues/226 is not fixed, # we depend on a debian testing box - config.vm.box = "leap-jessie-amd64" + config.vm.box = "leap-wheezy" deb.vm.provider "virtualbox" do |v, override| - override.vm.box_url = "https://downloads.leap.se/platform/vagrant/virtualbox/leap-debian-jessie-amd64-virtualbox.box" + override.vm.box_url = "https://downloads.leap.se/platform/vagrant/virtualbox/leap-wheezy.box" end deb.vm.provider "libvirt" do |v, override| - override.vm.box_url = "https://downloads.leap.se/platform/vagrant/libvirt/Debian-jessie.beta1-amd64-netboot.box" + override.vm.box_url = "https://downloads.leap.se/platform/vagrant/libvirt/leap-wheezy.box" end deb.vm.provision "puppet" do |puppet| puppet.manifests_path = "provisioning/manifests" diff --git a/provisioning/modules/pixelated/files/apt/pixelated-preferences b/provisioning/modules/pixelated/files/apt/pixelated-preferences new file mode 100644 index 00000000..cc01f73f --- /dev/null +++ b/provisioning/modules/pixelated/files/apt/pixelated-preferences @@ -0,0 +1,11 @@ +Package: python-twisted* +Pin: release a=wheezy-backports +Pin-Priority: 999 + +Package: python-whoosh +Pin: origin packages.pixelated-project.org +Pin-Priority: 999 + +Package: python-pycryptopp +Pin: release a=wheezy-backports +Pin-Priority: 999 diff --git a/provisioning/modules/pixelated/files/apt/pixelated.list b/provisioning/modules/pixelated/files/apt/pixelated.list new file mode 100644 index 00000000..e5aa0aee --- /dev/null +++ b/provisioning/modules/pixelated/files/apt/pixelated.list @@ -0,0 +1,3 @@ +deb http://packages.pixelated-project.org/debian wheezy-snapshots main +deb http://packages.pixelated-project.org/debian wheezy-backports main +deb http://packages.pixelated-project.org/debian wheezy main diff --git a/provisioning/modules/pixelated/manifests/apt.pp b/provisioning/modules/pixelated/manifests/apt.pp index 14517977..4519fb21 100644 --- a/provisioning/modules/pixelated/manifests/apt.pp +++ b/provisioning/modules/pixelated/manifests/apt.pp @@ -3,12 +3,18 @@ class pixelated::apt { # pixelated repo file { '/etc/apt/sources.list.d/pixelated.list': - content => "deb http://packages.pixelated-project.org/debian wheezy-snapshots main\ndeb http://packages.pixelated-project.org/debian wheezy-backports main\ndeb http://packages.pixelated-project.org/debian wheezy main\n", + source => 'puppet:///modules/pixelated/apt/pixelated.list', owner => 'root', require => Exec['add_pixelated_key'], notify => Exec['apt_get_update'], } + file { '/etc/apt/preferences.d/pixelated': + source => 'puppet:///modules/pixelated/apt/pixelated-preferences', + owner => 'root', + notify => Exec['apt_get_update'], + } + file { '/tmp/0x287A1542472DC0E3_packages@pixelated-project.org.asc': source => 'puppet:///modules/pixelated/0x287A1542472DC0E3_packages@pixelated-project.org.asc', notify => Exec['add_pixelated_key'] diff --git a/web-ui/app/scss/_mixins.scss b/web-ui/app/scss/_mixins.scss index dfc0f2ec..4233e4d0 100644 --- a/web-ui/app/scss/_mixins.scss +++ b/web-ui/app/scss/_mixins.scss @@ -87,7 +87,6 @@ padding: 2px 3px; margin: 0 1px; position: relative; - text-transform: uppercase; @include border-radius(2px); &[data-tag="drafts"] { color: $attention; |