Ticket #49026: patch-setup.py.diff
File patch-setup.py.diff, 2.1 KB (added by fclaire@…, 9 years ago) |
---|
-
setup.py
old new 126 126 for f in w[2]] 127 127 }, 128 128 data_files = [ 129 (' /etc/fail2ban',129 ('@@PREFIX@@/etc/fail2ban', 130 130 glob("config/*.conf") 131 131 ), 132 (' /etc/fail2ban/filter.d',132 ('@@PREFIX@@/etc/fail2ban/filter.d', 133 133 glob("config/filter.d/*.conf") 134 134 ), 135 (' /etc/fail2ban/filter.d/ignorecommands',135 ('@@PREFIX@@/etc/fail2ban/filter.d/ignorecommands', 136 136 glob("config/filter.d/ignorecommands/*") 137 137 ), 138 (' /etc/fail2ban/action.d',138 ('@@PREFIX@@/etc/fail2ban/action.d', 139 139 glob("config/action.d/*.conf") + 140 140 glob("config/action.d/*.py") 141 141 ), 142 (' /etc/fail2ban/fail2ban.d',142 ('@@PREFIX@@/etc/fail2ban/fail2ban.d', 143 143 '' 144 144 ), 145 (' /etc/fail2ban/jail.d',145 ('@@PREFIX@@/etc/fail2ban/jail.d', 146 146 '' 147 147 ), 148 (' /var/lib/fail2ban',148 ('@@PREFIX@@/var/lib/fail2ban', 149 149 '' 150 150 ), 151 (' /usr/share/doc/fail2ban',151 ('@@PREFIX@@/share/doc/fail2ban', 152 152 ['README.md', 'README.Solaris', 'DEVELOP', 'FILTERS', 153 153 'doc/run-rootless.txt'] 154 154 ) … … 160 160 # Search for obsolete files. 161 161 obsoleteFiles = [] 162 162 elements = { 163 " /etc/":163 "@@PREFIX@@/etc/": 164 164 [ 165 165 "fail2ban.conf" 166 166 ], 167 " /usr/bin/":167 "@@PREFIX@@/usr/bin/": 168 168 [ 169 169 "fail2ban.py" 170 170 ], 171 " /usr/lib/fail2ban/":171 "@@PREFIX@@/usr/lib/fail2ban/": 172 172 [ 173 173 "version.py", 174 174 "protocol.py" … … 191 191 print("\t" + f) 192 192 print("") 193 193 194 if isdir(" /usr/lib/fail2ban"):194 if isdir("@@PREFIX@@/usr/lib/fail2ban"): 195 195 print("") 196 print("Fail2ban is not installed under /usr/lib anymore. The new "197 "location is under /usr/share. Please remove the directory "198 " /usr/lib/fail2ban and everything under this directory.")196 print("Fail2ban is not installed under @@PREFIX@@/usr/lib anymore. The new " 197 "location is under @@PREFIX@@/usr/share. Please remove the directory " 198 "@@PREFIX@@/usr/lib/fail2ban and everything under this directory.") 199 199 print("") 200 200 201 201 # Update config file 202 202 if sys.argv[1] == "install": 203 203 print("") 204 204 print("Please do not forget to update your configuration files.") 205 print("They are in /etc/fail2ban/.")205 print("They are in @@PREFIX@@/etc/fail2ban/.") 206 206 print("")