diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 19f126644fb369b1dabac4f6c86f3cf88df93491..a3a6ab7498cc897222b2c2590d5c3da1d82ccbc6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,6 +39,8 @@ test:
- build
deploy:
stage: deploy
+ only:
+ - master
tags:
- ubuntu
- regular
diff --git a/package/data/50unattended-upgrades b/package/data/50unattended-upgrades
index bac044a5615bd6ccc508c3af1ca3140105aaa585..e23f6d4a65648482311f9f2c321ef669bf1ff41c 100644
--- a/package/data/50unattended-upgrades
+++ b/package/data/50unattended-upgrades
@@ -33,10 +33,7 @@ Unattended-Upgrade::Origins-Pattern {
// Note that this will silently match a different release after
// migration to the specified archive (e.g. testing becomes the
// new stable).
-// "o=Debian,a=stable";
-// "o=Debian,a=stable-updates";
-// "o=Debian,a=proposed-updates";
- "origin=Debian,codename=${distro_codename},label=Debian-Security";
+ "o=*";
};
// List of packages to not update (regexp are supported)
@@ -48,7 +45,7 @@ Unattended-Upgrade::Package-Blacklist {
};
// This option allows you to control if on a unclean dpkg exit
-// unattended-upgrades will automatically run
+// unattended-upgrades will automatically run
// dpkg --force-confold --configure -a
// The default is true, to ensure updates keep getting installed
//Unattended-Upgrade::AutoFixInterruptedDpkg "false";
@@ -79,7 +76,7 @@ Unattended-Upgrade::Package-Blacklist {
//Unattended-Upgrade::Remove-Unused-Dependencies "false";
// Automatically reboot *WITHOUT CONFIRMATION* if
-// the file /var/run/reboot-required is found after the upgrade
+// the file /var/run/reboot-required is found after the upgrade
//Unattended-Upgrade::Automatic-Reboot "false";
// Automatically reboot even if there are users currently logged in.
diff --git a/package/data/50unattended-upgrades.Debian b/package/data/50unattended-upgrades.Debian
index bac044a5615bd6ccc508c3af1ca3140105aaa585..62f889b1d9df38fb7b0b550b7475cf1f6e74c0dd 100644
--- a/package/data/50unattended-upgrades.Debian
+++ b/package/data/50unattended-upgrades.Debian
@@ -33,10 +33,9 @@ Unattended-Upgrade::Origins-Pattern {
// Note that this will silently match a different release after
// migration to the specified archive (e.g. testing becomes the
// new stable).
-// "o=Debian,a=stable";
-// "o=Debian,a=stable-updates";
-// "o=Debian,a=proposed-updates";
- "origin=Debian,codename=${distro_codename},label=Debian-Security";
+
+ "o=*";
+
};
// List of packages to not update (regexp are supported)
@@ -48,7 +47,7 @@ Unattended-Upgrade::Package-Blacklist {
};
// This option allows you to control if on a unclean dpkg exit
-// unattended-upgrades will automatically run
+// unattended-upgrades will automatically run
// dpkg --force-confold --configure -a
// The default is true, to ensure updates keep getting installed
//Unattended-Upgrade::AutoFixInterruptedDpkg "false";
@@ -79,7 +78,7 @@ Unattended-Upgrade::Package-Blacklist {
//Unattended-Upgrade::Remove-Unused-Dependencies "false";
// Automatically reboot *WITHOUT CONFIRMATION* if
-// the file /var/run/reboot-required is found after the upgrade
+// the file /var/run/reboot-required is found after the upgrade
//Unattended-Upgrade::Automatic-Reboot "false";
// Automatically reboot even if there are users currently logged in.
diff --git a/package/data/50unattended-upgrades.Ubuntu b/package/data/50unattended-upgrades.Ubuntu
index 3656ebed5cceaa5132ba312f7b37b0be965aaba3..f55cf6d3576accf91b25bb19125ec91ed7402702 100644
--- a/package/data/50unattended-upgrades.Ubuntu
+++ b/package/data/50unattended-upgrades.Ubuntu
@@ -1,11 +1,13 @@
// Automatically upgrade packages from these (origin:archive) pairs
Unattended-Upgrade::Allowed-Origins {
"${distro_id}:${distro_codename}";
- "site=http://repo.c3sl.ufpr.br/le6/,component=main"
-// "${distro_id}:${distro_codename}-security";
-// "${distro_id}:${distro_codename}-updates";
-// "${distro_id}:${distro_codename}-proposed";
-// "${distro_id}:${distro_codename}-backports";
+ "${distro_id}:${distro_codename}-security";
+ "${distro_id}:${distro_codename}-updates";
+ // "${distro_id}:${distro_codename}-proposed";
+ // "${distro_id}:${distro_codename}-backports";
+ "C3SL:stable";
+ "C3SL:testing";
+
};
// List of packages to not update (regexp are supported)
@@ -26,7 +28,7 @@ Unattended-Upgrade::Package-Blacklist {
// they can be interrupted with SIGUSR1. This makes the upgrade
// a bit slower but it has the benefit that shutdown while a upgrade
// is running is possible (with a small delay)
- Unattended-Upgrade::MinimalSteps "true";
+Unattended-Upgrade::MinimalSteps "true";
// Install all unattended-upgrades when the machine is shuting down
// instead of doing it in the background while the machine is running
@@ -45,7 +47,7 @@ Unattended-Upgrade::Package-Blacklist {
// Do automatic removal of new unused dependencies after the upgrade
// (equivalent to apt-get autoremove)
-//Unattended-Upgrade::Remove-Unused-Dependencies "True";
+Unattended-Upgrade::Remove-Unused-Dependencies "True";
// Automatically reboot *WITHOUT CONFIRMATION*
// if the file /var/run/reboot-required is found after the upgrade
diff --git a/package/data/cron.py b/package/data/cront.py
similarity index 98%
rename from package/data/cron.py
rename to package/data/cront.py
index 80b4e94d70aef5c77fff184c6d3ea0925d10a0e5..ae1359d41f455faabccf3de0fa6b51108a370940 100644
--- a/package/data/cron.py
+++ b/package/data/cront.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-#!/usr/bin/python
+#!/usr/bin/env python3
+#!/usr/bin/python3
#
# Copyright (C) 2004-2016 Centro de Computacao Cientifica e Software Livre
# Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
diff --git a/package/data/preferences b/package/data/preferences
index 7f19723ab1335f3f9e04998b4be7aed55e730073..9b3b99a00c0d828f865e3d9acf615feb7da8afd9 100644
--- a/package/data/preferences
+++ b/package/data/preferences
@@ -1,11 +1,11 @@
Package: *
-Pin: origin repo.c3sl.ufpr.br/le6/
+Pin: origin repo.c3sl.ufpr.br
Pin-Priority: 1100
Package: *
Pin: release n=xenial
-Pin-Priority: 50
+Pin-Priority: 100
Package: *
Pin: release n=xenial-updates
-Pin-Priority: 50
+Pin-Priority: 100
diff --git a/package/debian/changelog b/package/debian/changelog
index 521737125f698b75dac7e58a968c01a61a909bfc..9e93e77a402355c4aff001cbb8ddf06f7016cac0 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,21 +1,33 @@
+unattended-upgrades (1.0.4) testing; urgency=medium
+
+ * Fix in configuration to get updates from repository
+
+ -- Arianne de Paula Bortolan <apb14@inf.ufpr.br> Wed, 24 May 2017 09:16:13 -0200
+
+unattended-upgrades (1.0.3) testing; urgency=medium
+
+ * Change in 50unattended archive
+
+ -- Arianne de Paula Bortolan <apb14@inf.ufpr.br> Thu, 10 May 2017 10:13:13 -0200
+
unattended-upgrades (1.0.2) testing; urgency=medium
* Fix on cron.py
- -- Arianne de Paula Bortolan <apb14@inf.ufpr.br> Jan, 17 Jan 2017 09:53:40 -0200
+ -- Arianne de Paula Bortolan <apb14@inf.ufpr.br> Tue, 17 Jan 2017 09:53:40 -0200
unattended-upgrades (1.0.1) testing; urgency=medium
* Change for rebase
- -- Arianne de Paula Bortolan <apb14@inf.ufpr.br> Jan, 13 Jan 2017 11:43:30 -0200
+ -- Arianne de Paula Bortolan <apb14@inf.ufpr.br> Fri, 13 Jan 2017 11:43:30 -0200
unattended-upgrades (1.0.0) testing; urgency=medium
* Modified package version so guarante to install correct version on LE6.
* Add man page with patch name of this package.
- -- Arianne de Paula Bortolan <apb14@inf.ufpr.br> Jan, 13 Jan 2017 11:43:30 -0200
+ -- Arianne de Paula Bortolan <apb14@inf.ufpr.br> Fri, 13 Jan 2017 11:43:30 -0200
unattended-upgrades (0.9.2) testing; urgency=medium
diff --git a/package/debian/postinst b/package/debian/postinst
index 7f5b5bac9c7ac16d010c24ffe82ee064060e11c5..00abfee9af97575f99e6c846d867898a35aa1543 100644
--- a/package/debian/postinst
+++ b/package/debian/postinst
@@ -78,7 +78,7 @@ esac
#DEBHELPER#
# run the change of crontabs
-SCRIPT="/usr/share/unattended-upgrades/cron.py"
-python $SCRIPT
+SCRIPT="/usr/share/unattended-upgrades/cront.py"
+python3 $SCRIPT
exit 0
diff --git a/package/setup.py b/package/setup.py
index c6bcff2e029d6f50469bd42080c358db8618de1c..56b580f5a614169101e7dc46992172cef201c954 100755
--- a/package/setup.py
+++ b/package/setup.py
@@ -15,13 +15,13 @@ if __name__ == "__main__":
data_files=[
('../etc/logrotate.d/',
["data/logrotate.d/unattended-upgrades"]),
- ('../etc/apt/preferences.d/',
+ ('../etc/apt/',
["data/preferences"]),
('../usr/share/unattended-upgrades/',
["data/20auto-upgrades",
"data/20auto-upgrades-disabled",
"data/50unattended-upgrades",
- "data/cron.py",
+ "data/cront.py",
"unattended-upgrade-shutdown"]),
('../usr/share/man/man8/',
["man/unattended-upgrade.8",